a few more forward declarations

qgis · Oct 9, 2018 · 7c0a2a1 · 7c0a2a1
1 parent f27a504
commit 7c0a2a1
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 48 deletions.
diff --git a/python/gui/auto_generated/qgspluginmanagerinterface.sip.in b/python/gui/auto_generated/qgspluginmanagerinterface.sip.in
@@ -8,6 +8,7 @@
 
 
 
+
 class QgsPluginManagerInterface : QObject
 {
 

diff --git a/src/app/3d/qgs3dmapcanvasdockwidget.cpp b/src/app/3d/qgs3dmapcanvasdockwidget.cpp
@@ -15,25 +15,28 @@
 
 #include "qgs3dmapcanvasdockwidget.h"
 
+#include <QBoxLayout>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QProgressBar>
+#include <QToolBar>
+#include <QUrl>
+
 #include "qgisapp.h"
 #include "qgs3dmapcanvas.h"
 #include "qgs3dmapconfigwidget.h"
 #include "qgs3dmapscene.h"
 #include "qgscameracontroller.h"
 #include "qgsmapcanvas.h"
+#include "qgsmessagebar.h"
 
 #include "qgs3danimationsettings.h"
 #include "qgs3danimationwidget.h"
 #include "qgs3dmapsettings.h"
 #include "qgs3dmaptoolidentify.h"
 #include "qgs3dutils.h"
 
-#include <QBoxLayout>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QProgressBar>
-#include <QToolBar>
-#include <QUrl>
+
 
 Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
   : QgsDockWidget( parent )

diff --git a/src/app/dwg/qgsdwgimportdialog.cpp b/src/app/dwg/qgsdwgimportdialog.cpp
@@ -47,6 +47,8 @@
 #include "qgslayertree.h"
 #include "qgsguiutils.h"
 #include "qgsfilewidget.h"
+#include "qgsmessagebar.h"
+
 
 QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
   : QDialog( parent, f )

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -39,6 +39,7 @@
 #include "qgslayoutitemmap.h"
 #include "qgsprintlayout.h"
 #include "qgsmapcanvas.h"
+#include "qgsmessagebar.h"
 #include "qgsmessageviewer.h"
 #include "qgsgui.h"
 #include "qgsfeedback.h"

diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp
@@ -35,6 +35,7 @@
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsconfig.h"
+#include "qgsmessagebar.h"
 #include "qgsproviderregistry.h"
 #include "qgspluginregistry.h"
 #include "qgspluginsortfilterproxymodel.h"

diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h
@@ -27,10 +27,10 @@
 #include "qgsoptionsdialogbase.h"
 #include "qgsguiutils.h"
 #include "qgshelp.h"
-#include "qgsmessagebar.h"
 
 class QgsPluginSortFilterProxyModel;
 class QgsPythonUtils;
+class QgsMessageBar;
 
 const int PLUGMAN_TAB_ALL = 0;
 const int PLUGMAN_TAB_INSTALLED = 1;

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -101,9 +101,7 @@ class QgsVectorLayerTools;
 class QgsWelcomePage;
 class QgsOptionsWidgetFactory;
 class QgsStatusBar;
-
 class QgsUserProfileManagerWidgetFactory;
-
 class Qgs3DMapCanvasDockWidget;
 
 class QDomDocument;
@@ -116,15 +114,12 @@ class QgsAdvancedDigitizingDockWidget;
 class QgsGpsInformationWidget;
 class QgsStatisticalSummaryDockWidget;
 class QgsMapCanvasTracer;
-
 class QgsDecorationItem;
-
 class QgsMessageLogViewer;
 class QgsMessageBar;
-
+class QgsMessageBarItem;
 class QgsDataItem;
 class QgsTileScaleWidget;
-
 class QgsLabelingWidget;
 class QgsLayerStylingWidget;
 class QgsDiagramProperties;
@@ -145,9 +140,7 @@ class QgsProxyProgressTask;
 
 #include "qgsauthmanager.h"
 #include "qgsconfig.h"
-#include "qgsfeature.h"
 #include "qgspointxy.h"
-#include "qgsmessagebar.h"
 #include "qgsmimedatautils.h"
 #include "qgswelcomepageitemsmodel.h"
 #include "qgsraster.h"

diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -15,8 +15,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsmapsavedialog.h"
 
+#include <QClipboard>
+#include <QCheckBox>
+#include <QFileDialog>
+#include <QImage>
+#include <QList>
+#include <QPainter>
+#include <QPrinter>
+#include <QSpinBox>
+
+#include "qgsmapsavedialog.h"
+#include "qgsguiutils.h"
 #include "qgis.h"
 #include "qgisapp.h"
 #include "qgsscalecalculator.h"
@@ -29,15 +39,8 @@
 #include "qgsproject.h"
 #include "qgssettings.h"
 #include "qgsmapcanvas.h"
+#include "qgsmessagebar.h"
 
-#include <QClipboard>
-#include <QCheckBox>
-#include <QFileDialog>
-#include <QImage>
-#include <QList>
-#include <QPainter>
-#include <QPrinter>
-#include <QSpinBox>
 
 Q_GUI_EXPORT extern int qt_defaultDpiX();
 

diff --git a/src/app/qgsmaptoolcircle2tangentspoint.cpp b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@@ -28,6 +28,7 @@
 #include "qgsgeometryutils.h"
 #include <memory>
 #include "qgsmapmouseevent.h"
+#include "qgsmessagebar.h"
 
 QgsMapToolCircle2TangentsPoint::QgsMapToolCircle2TangentsPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

diff --git a/src/app/qgsmaptoolcircle3tangents.cpp b/src/app/qgsmaptoolcircle3tangents.cpp
@@ -23,6 +23,7 @@
 #include "qgspoint.h"
 #include "qgisapp.h"
 #include "qgsmapmouseevent.h"
+#include "qgsmessagebar.h"
 
 
 QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentTool,

diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
@@ -31,6 +31,7 @@
 #include "qgisapp.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
+#include "qgsmessagebar.h"
 
 #ifdef WITH_BINDINGS
 #include "qgspythonutils.h"

diff --git a/src/app/qgsselectbyformdialog.cpp b/src/app/qgsselectbyformdialog.cpp
@@ -13,12 +13,14 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QLayout>
+
 #include "qgsselectbyformdialog.h"
 #include "qgsattributeform.h"
 #include "qgsmapcanvas.h"
 #include "qgssettings.h"
+#include "qgsmessagebar.h"
 
-#include <QLayout>
 
 QgsSelectByFormDialog::QgsSelectByFormDialog( QgsVectorLayer *layer, const QgsAttributeEditorContext &context, QWidget *parent, Qt::WindowFlags fl )
   : QDialog( parent, fl )

diff --git a/src/app/qgsvectorlayerloadstyledialog.cpp b/src/app/qgsvectorlayerloadstyledialog.cpp
@@ -22,7 +22,7 @@
 #include "qgssettings.h"
 #include "qgsvectorlayerproperties.h"
 #include "qgsmaplayerstylecategoriesmodel.h"
-
+#include "qgsmessagebar.h"
 
 
 QgsVectorLayerLoadStyleDialog::QgsVectorLayerLoadStyleDialog( QgsVectorLayer *layer, QWidget *parent )

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -63,6 +63,7 @@
 #include "qgsgeometryoptions.h"
 #include "qgsvectorlayersavestyledialog.h"
 #include "qgsvectorlayerloadstyledialog.h"
+#include "qgsmessagebar.h"
 
 #include "layertree/qgslayertreelayer.h"
 #include "qgslayertree.h"

diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -13,6 +13,16 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QColor>
+#include <QImage>
+#include <QPainter>
+#include <QSize>
+#include <QSvgGenerator>
+
+#include <cmath>
+#include <map>
+#include <random>
+
 #include "qgssymbol.h"
 #include "qgssymbollayer.h"
 
@@ -21,17 +31,14 @@
 #include "qgsfillsymbollayer.h"
 #include "qgsgeometrygeneratorsymbollayer.h"
 #include "qgsmaptopixelgeometrysimplifier.h"
-
 #include "qgslogger.h"
 #include "qgsrendercontext.h" // for bigSymbolPreview
-
 #include "qgsproject.h"
 #include "qgsstyle.h"
 #include "qgspainteffect.h"
 #include "qgseffectstack.h"
-
 #include "qgsvectorlayer.h"
-
+#include "qgsfeature.h"
 #include "qgsgeometry.h"
 #include "qgsmultipoint.h"
 #include "qgsgeometrycollection.h"
@@ -41,16 +48,6 @@
 #include "qgsproperty.h"
 #include "qgscolorschemeregistry.h"
 
-#include <QColor>
-#include <QImage>
-#include <QPainter>
-#include <QSize>
-#include <QSvgGenerator>
-
-#include <cmath>
-#include <map>
-#include <random>
-
 inline
 QgsProperty rotateWholeSymbol( double additionalRotation, const QgsProperty &property )
 {

diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
@@ -21,7 +21,6 @@
 #include <QList>
 #include <QMap>
 #include "qgsmapunitscale.h"
-#include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsrendercontext.h"
 #include "qgsproperty.h"
@@ -44,6 +43,7 @@ class QgsMarkerSymbolLayer;
 class QgsLineSymbolLayer;
 class QgsFillSymbolLayer;
 class QgsSymbolRenderContext;
+class QgsFeature;
 class QgsFeatureRenderer;
 class QgsCurve;
 class QgsPolygon;

diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include "qgslayertreeviewdefaultactions.h"
-
+#include "qgsguiutils.h"
 #include "qgsapplication.h"
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"

diff --git a/src/gui/qgsexpressionselectiondialog.h b/src/gui/qgsexpressionselectiondialog.h
@@ -18,13 +18,13 @@
 
 #include "ui_qgsexpressionselectiondialogbase.h"
 #include "qgis.h"
-#include "qgsmessagebar.h"
 #include "qgshelp.h"
 
 #include <QDialog>
 #include "qgis_gui.h"
 
 class QgsMapCanvas;
+class QgsMessageBar;
 
 /**
  * \ingroup gui

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -22,7 +22,6 @@
 #include "qgis_sip.h"
 
 #include "qgsexpressioncontext.h"
-#include "qgsmessagebar.h"
 #include "qgsrectangle.h"
 #include "qgsfeatureid.h"
 #include "qgsgeometry.h"

diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -18,7 +18,6 @@
 
 #include "qgsconfig.h"
 #include "qgis.h"
-#include "qgsmessagebar.h"
 
 #include <QCursor>
 #include <QString>

diff --git a/src/gui/qgsmessagebaritem.h b/src/gui/qgsmessagebaritem.h
@@ -19,14 +19,14 @@
 
 #include "qgsmessagebaritem.h"
 #include "qgis.h"
-#include "qgsmessagebar.h"
 
 #include <QWidget>
 #include <QIcon>
 #include <QHBoxLayout>
 #include "qgis_gui.h"
 
 class QTextBrowser;
+class QLabel;
 
 /**
  * \ingroup gui

diff --git a/src/gui/qgspluginmanagerinterface.h b/src/gui/qgspluginmanagerinterface.h
@@ -20,8 +20,9 @@
 #include <QObject>
 #include <QString>
 #include <QMap>
-#include "qgsmessagebar.h"
 #include "qgis_gui.h"
+#include "qgis.h"
+
 
 /**
  * \ingroup gui

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -26,6 +26,7 @@
 #include "qgsgrassselect.h"
 #include "qgsgrasstools.h"
 #include "qgsgrassutils.h"
+#include "qgsmessagebar.h"
 
 // includes
 #include "qgisinterface.h"

diff --git a/tests/src/app/testqgsmaptoolselect.cpp b/tests/src/app/testqgsmaptoolselect.cpp
@@ -25,6 +25,7 @@
 #include "qgsunittypes.h"
 #include "qgsmaptoolselect.h"
 #include "qgsmaptoolselectutils.h"
+#include "qgsmapmouseevent.h"
 
 #include "cpl_conv.h"
 

diff --git a/tests/src/app/testqgsmaptoolutils.h b/tests/src/app/testqgsmaptoolutils.h
@@ -20,6 +20,8 @@
 #include "qgisapp.h"
 #include "qgsgeometry.h"
 #include "qgsmapcanvas.h"
+#include "qgsmapmouseevent.h"
+
 
 /**
  * \ingroup UnitTests

diff --git a/tests/src/app/testqgsvertextool.cpp b/tests/src/app/testqgsvertextool.cpp
@@ -21,7 +21,7 @@
 #include "qgsmapcanvassnappingutils.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
-
+#include "qgsmapmouseevent.h"
 #include "vertextool/qgsvertextool.h"
 
 bool operator==( const QgsGeometry &g1, const QgsGeometry &g2 )