Skip to content

Commit

Permalink
resolve cyclic include masking QgsDiagramLayerSettings in 2479d83 on …
Browse files Browse the repository at this point in the history
…windows
  • Loading branch information
jef-n committed May 6, 2013
1 parent d198188 commit ca43d8d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion src/core/qgsdiagramrendererv2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspallabeling.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class QgsMapRenderer;
class QgsRectangle;
class QgsCoordinateTransform;
class QgsLabelSearchTree;
class QgsDiagramLayerSettings;

#include <QString>
#include <QFont>
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsvectorlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
#include "qgsdiagramrendererv2.h"
#include "qgsstylev2.h"
#include "qgssymbologyv2conversion.h"
#include "qgspallabeling.h"

#ifdef TESTPROVIDERLIB
#include <dlfcn.h>
Expand Down
1 change: 1 addition & 0 deletions tests/src/core/testqgsdiagram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit ca43d8d

Please sign in to comment.