Skip to content
Permalink
Browse files

resolve cyclic include masking QgsDiagramLayerSettings in 2479d83 on …

…windows
  • Loading branch information
jef-n committed May 6, 2013
1 parent d198188 commit ca43d8df2c1413ba0657e1919cf78892ae181055
@@ -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
@@ -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;
@@ -73,6 +73,7 @@
#include "qgsdiagramrendererv2.h"
#include "qgsstylev2.h"
#include "qgssymbologyv2conversion.h"
#include "qgspallabeling.h"

#ifdef TESTPROVIDERLIB
#include <dlfcn.h>
@@ -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.

0 comments on commit ca43d8d

Please sign in to comment.
You can’t perform that action at this time.