forward declarations for QgsMapCanvas

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

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -38,6 +38,7 @@
 #include "qgssettings.h"
 #include "qgsstatusbar.h"
 #include "gmath.h"
+#include "qgsmapcanvas.h"
 
 // QWT Charting widget
 

diff --git a/src/app/gps/qgsgpsinformationwidget.h b/src/app/gps/qgsgpsinformationwidget.h
@@ -21,7 +21,6 @@
 
 #include "gmath.h"
 #include "info.h"
-#include "qgsmapcanvas.h"
 #include "qgsgpsmarker.h"
 #include "qgsmaptoolcapture.h"
 #include <qwt_plot_curve.h>
@@ -35,6 +34,7 @@ class QextSerialPort;
 class QgsGpsConnection;
 class QgsGpsTrackerThread;
 struct QgsGpsInformation;
+class QgsMapCanvas;
 
 class QFile;
 class QColor;

diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -28,6 +28,7 @@
 #include "qgsmaprenderertask.h"
 #include "qgsproject.h"
 #include "qgssettings.h"
+#include "qgsmapcanvas.h"
 
 #include <QClipboard>
 #include <QCheckBox>

diff --git a/src/app/qgsmapsavedialog.h b/src/app/qgsmapsavedialog.h
@@ -21,14 +21,16 @@
 #include "ui_qgsmapsavedialog.h"
 
 #include "qgisapp.h"
-#include "qgsmapcanvas.h"
 #include "qgsmapdecoration.h"
 #include "qgsrectangle.h"
 #include "qgshelp.h"
 
 #include <QDialog>
 #include <QSize>
 
+class QgsMapCanvas;
+
+
 /**
  * \ingroup app
  * \brief a dialog for saving a map to an image.

diff --git a/src/app/vertextool/qgsselectedfeature.cpp b/src/app/vertextool/qgsselectedfeature.cpp
@@ -28,6 +28,8 @@
 #include "qgslayertreeview.h"
 #include "qgsproject.h"
 #include "qgsstatusbar.h"
+#include "qgsmapcanvas.h"
+
 
 QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
                                         QgsVectorLayer *vlayer,

diff --git a/src/gui/qgsexpressionselectiondialog.cpp b/src/gui/qgsexpressionselectiondialog.cpp
@@ -18,6 +18,7 @@
 #include "qgsapplication.h"
 #include "qgsexpression.h"
 #include "qgsgeometry.h"
+#include "qgsmapcanvas.h"
 #include "qgsmessagebar.h"
 #include "qgsvectorlayer.h"
 #include "qgssettings.h"

diff --git a/src/gui/qgsexpressionselectiondialog.h b/src/gui/qgsexpressionselectiondialog.h
@@ -18,14 +18,14 @@
 
 #include "ui_qgsexpressionselectiondialogbase.h"
 #include "qgis.h"
-
-#include "qgsmapcanvas.h"
 #include "qgsmessagebar.h"
 #include "qgshelp.h"
 
 #include <QDialog>
 #include "qgis_gui.h"
 
+class QgsMapCanvas;
+
 /**
  * \ingroup gui
  * This class offers a dialog to change feature selections.

diff --git a/src/gui/qgsmetadatawidget.h b/src/gui/qgsmetadatawidget.h
@@ -17,8 +17,9 @@
 #ifndef QgsAbstractMetadataBaseWIDGET_H
 #define QgsAbstractMetadataBaseWIDGET_H
 
-#include "QStandardItemModel"
-#include "QStyledItemDelegate"
+#include <QStandardItemModel>
+#include <QStyledItemDelegate>
+#include <QStringListModel>
 
 #include "qgis_gui.h"
 #include "qgscoordinatereferencesystem.h"
@@ -27,6 +28,7 @@
 #include "ui_qgsmetadatawidget.h"
 
 class QgsMapLayer;
+class QgsMapCanvas;
 
 /**
  * \ingroup gui

diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
@@ -32,14 +32,15 @@
 
 #include "qgsmaptool.h"
 #include "qgsfeature.h"
-#include "qgsmapcanvas.h"
 #include "qgisinterface.h"
 #include "qgsvectordataprovider.h"
 
 #include "evisconfiguration.h"
 
 #include "ui_evisgenericeventbrowserguibase.h"
 
+class QgsMapCanvas;
+
 /**
 * \class eVisGenericEventBrowserGui
 * \brief Generic viewer for browsing event