forward declarations for QgsMapLayer

qgis · Oct 8, 2018 · d000157 · d000157
1 parent f86b86b
commit d000157
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 9 deletions.
diff --git a/python/core/auto_generated/qgsmaplayerstylemanager.sip.in b/python/core/auto_generated/qgsmaplayerstylemanager.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsMapLayerStyleManager : QObject
 {
 %Docstring

diff --git a/python/gui/auto_generated/qgsmetadatawidget.sip.in b/python/gui/auto_generated/qgsmetadatawidget.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsMetadataWidget : QWidget
 {
 %Docstring

diff --git a/src/app/vertextool/qgsvertexentry.cpp b/src/app/vertextool/qgsvertexentry.cpp
@@ -14,6 +14,8 @@
  ***************************************************************************/
 
 #include "vertextool/qgsvertexentry.h"
+#include "qgsmaplayer.h"
+#include "qgsmapcanvas.h"
 
 QgsVertexEntry::QgsVertexEntry( QgsMapCanvas *canvas, QgsMapLayer *layer, const QgsPoint &p, QgsVertexId vertexId, const QString &tooltip, QgsVertexMarker::IconType type, int penWidth )
   : mSelected( false )

diff --git a/src/app/vertextool/qgsvertexentry.h b/src/app/vertextool/qgsvertexentry.h
@@ -18,8 +18,9 @@
 
 #include "qgspoint.h"
 #include "qgsvertexmarker.h"
-#include "qgsmapcanvas.h"
+
-#include "qgsmaplayer.h"
+class QgsMapLayer;
+class QgsMapCanvas;
 
 class QgsVertexEntry
 {

diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -25,6 +25,7 @@
 
 #include "qgsdataitem.h"
 #include "qgsmaphittest.h"
+#include "qgsmaplayer.h"
 #include "qgsmaplayerlegend.h"
 #include "qgsmaplayerstylemanager.h"
 #include "qgspluginlayer.h"

diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h
@@ -24,14 +24,12 @@
 #include <memory>
 
 #include "qgsgeometry.h"
-#include "qgsmaplayer.h"
 #include "qgslayertreemodellegendnode.h"
 
 class QgsLayerTreeNode;
 class QgsLayerTreeGroup;
 class QgsLayerTreeLayer;
 class QgsMapHitTest;
-class QgsMapLayer;
 class QgsMapSettings;
 class QgsExpression;
 class QgsRenderContext;

diff --git a/src/core/qgsmaplayerstyle.cpp b/src/core/qgsmaplayerstyle.cpp
@@ -16,6 +16,8 @@
 #include "qgsmaplayerstyle.h"
 #include "qgsmaplayerstylemanager.h"
 #include "qgsreadwritecontext.h"
+#include "qgsmaplayer.h"
+
 
 #include "qgslogger.h"
 

diff --git a/src/core/qgsmaplayerstylemanager.cpp b/src/core/qgsmaplayerstylemanager.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsmaplayerstylemanager.h"
 #include "qgsmaplayerstyle.h"
+#include "qgsmaplayer.h"
 
 #include "qgslogger.h"
 

diff --git a/src/core/qgsmaplayerstylemanager.h b/src/core/qgsmaplayerstylemanager.h
@@ -18,7 +18,6 @@
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
-#include "qgsmaplayer.h"
 #include "qgsmaplayerstyle.h"
 
 #include <QByteArray>
@@ -29,6 +28,8 @@
 
 class QDomElement;
 
+class QgsMapLayer;
+
 /**
  * \ingroup core
  * Management of styles for use with one map layer. Stored styles are identified by their names. The manager

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -40,7 +40,6 @@
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransformcontext.h"
 #include "qgsprojectproperty.h"
-#include "qgsmaplayer.h"
 #include "qgsmaplayerstore.h"
 #include "qgsarchive.h"
 #include "qgsreadwritecontext.h"
@@ -70,6 +69,7 @@ class QgsLayoutManager;
 class QgsLayerTree;
 class QgsLabelingEngineSettings;
 class QgsAuxiliaryStorage;
+class QgsMapLayer;
 
 /**
  * \ingroup core

diff --git a/src/gui/qgsmetadatawidget.h b/src/gui/qgsmetadatawidget.h
@@ -23,10 +23,11 @@
 #include "qgis_gui.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsdataprovider.h"
-#include "qgsmaplayer.h"
 #include "qgslayermetadata.h"
 #include "ui_qgsmetadatawidget.h"
 
+class QgsMapLayer;
+
 /**
  * \ingroup gui
  * \class QgsMetadataWidget

diff --git a/src/plugins/evis/idtool/eviseventidtool.h b/src/plugins/evis/idtool/eviseventidtool.h
@@ -30,13 +30,14 @@
 #include <QMouseEvent>
 #include <QWidget>
 
-#include "qgsmaplayer.h"
 #include "qgsmaptool.h"
 #include "qgsmapcanvas.h"
 #include "qgspointxy.h"
 
 #include "evisgenericeventbrowsergui.h"
 
+class QgsMapLayer;
+
 /**
 * \class eVisEventIdTool
 * \brief Map tool for launching event browser

diff --git a/src/server/services/wms/qgslayerrestorer.h b/src/server/services/wms/qgslayerrestorer.h
@@ -20,7 +20,7 @@
 
 #include <QList>
 
-#include "qgsmaplayer.h"
+class QgsMapLayer;
 
 /**
  * \ingroup server