resolve cyclic include masking QgsDiagramLayerSettings in 2479d83 on …

…windows
qgis · May 6, 2013 · ca43d8d · ca43d8d
1 parent d198188
commit ca43d8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/core/qgsdiagramrendererv2.h b/src/core/qgsdiagramrendererv2.h
@@ -20,14 +20,18 @@
 #include <QList>
 #include <QPointF>
 #include <QSizeF>
+#include <QDomDocument>
+
 #include "qgsfeature.h"
-#include "qgspallabeling.h"
 
 class QgsDiagram;
 class QgsDiagramRendererV2;
 class QgsFeature;
 class QgsRenderContext;
 class QDomElement;
+class QgsPalGeometry;
+class QgsCoordinateTransform;
+class QgsMapToPixel;
 namespace pal { class Layer; }
 
 class CORE_EXPORT QgsDiagramLayerSettings

diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -29,7 +29,6 @@ class QgsMapRenderer;
 class QgsRectangle;
 class QgsCoordinateTransform;
 class QgsLabelSearchTree;
-class QgsDiagramLayerSettings;
 
 #include <QString>
 #include <QFont>
@@ -53,6 +52,7 @@ class QgsFeature;
 #include "qgsrectangle.h"
 #include "qgsmaprenderer.h" // definition of QgsLabelingEngineInterface
 #include "qgsexpression.h"
+#include "qgsdiagramrendererv2.h"
 
 class QgsPalGeometry;
 class QgsVectorLayer;

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -73,6 +73,7 @@
 #include "qgsdiagramrendererv2.h"
 #include "qgsstylev2.h"
 #include "qgssymbologyv2conversion.h"
+#include "qgspallabeling.h"
 
 #ifdef TESTPROVIDERLIB
 #include <dlfcn.h>

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -41,6 +41,7 @@
 #include <qgsrendererv2.h>
 //qgis test includes
 #include "qgsrenderchecker.h"
+#include "qgspallabeling.h"
 
 /** \ingroup UnitTests
  * This is a unit test for the vector layer class.