remove useless includes

3nids · 3nids · commit f27a5043bb65 · 2018-10-09T11:48:33.000-08:00
diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsMeshDatasetIndex
 {
 %Docstring
diff --git a/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in b/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in
@@ -9,7 +9,6 @@
 
 
 
-
 class QgsLayoutViewRubberBand : QObject
 {
 %Docstring
diff --git a/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in b/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in
@@ -29,6 +29,7 @@ class QgsGroupBoxCollapseButton : QToolButton
   protected:
     virtual void mouseReleaseEvent( QMouseEvent *event );
 
+
 };
 
 
diff --git a/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in b/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsMapOverviewCanvas : QWidget
 {
 %Docstring
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -33,7 +33,6 @@
 #include "qgsfeatureaction.h"
 #include "qgisapp.h"
 
-#include <QMouseEvent>
 #include <QSettings>
 
 QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mode )
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 #include <QDialog>
-#include <QMouseEvent>
 
 #include "qgsmaptoolannotation.h"
 #include "qgsannotation.h"
diff --git a/src/app/qgsmaptooldigitizefeature.cpp b/src/app/qgsmaptooldigitizefeature.cpp
@@ -34,7 +34,6 @@
 #include "qgsfeatureaction.h"
 #include "qgisapp.h"
 
-#include <QMouseEvent>
 #include <QSettings>
 
 QgsMapToolDigitizeFeature::QgsMapToolDigitizeFeature( QgsMapCanvas *canvas, QgsMapLayer *layer, CaptureMode mode )
diff --git a/src/core/mesh/qgsmeshdataprovider.cpp b/src/core/mesh/qgsmeshdataprovider.cpp
@@ -16,11 +16,14 @@
  ***************************************************************************/
 
 #include "qgsmeshdataprovider.h"
+#include "qgsrectangle.h"
 #include "qgis.h"
 
 
-QgsMeshDatasetIndex::QgsMeshDatasetIndex( int group, int dataset ):
-  mGroupIndex( group ), mDatasetIndex( dataset ) {}
+
+QgsMeshDatasetIndex::QgsMeshDatasetIndex( int group, int dataset )
+  : mGroupIndex( group ), mDatasetIndex( dataset )
+{}
 
 int QgsMeshDatasetIndex::group() const
 {
diff --git a/src/core/mesh/qgsmeshdataprovider.h b/src/core/mesh/qgsmeshdataprovider.h
@@ -18,16 +18,17 @@
 #ifndef QGSMESHDATAPROVIDER_H
 #define QGSMESHDATAPROVIDER_H
 
-#include "qgis_core.h"
-#include "qgspoint.h"
-#include "qgsrectangle.h"
-#include "qgsdataprovider.h"
-
 #include <QVector>
 #include <QString>
 #include <QMap>
 #include <limits>
 
+#include "qgis_core.h"
+#include "qgspoint.h"
+#include "qgsdataprovider.h"
+
+class QgsRectangle;
+
 /**
  * \ingroup core
  *
diff --git a/src/gui/layout/qgslayoutviewrubberband.h b/src/gui/layout/qgslayoutviewrubberband.h
@@ -16,8 +16,6 @@
 #ifndef QGSLAYOUTVIEWRUBBERBAND_H
 #define QGSLAYOUTVIEWRUBBERBAND_H
 
-#include <QMouseEvent>
-
 #include "qgis_gui.h"
 #include "qgis_sip.h"
 #include <QBrush>
diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp
@@ -617,3 +617,10 @@ void QgsCollapsibleGroupBox::saveState() const
     mSettings->setValue( key + QStringLiteral( "/collapsed" ), isCollapsed() );
 }
 
+
+void QgsGroupBoxCollapseButton::mouseReleaseEvent( QMouseEvent *event )
+{
+  mAltDown = ( event->modifiers() & ( Qt::AltModifier | Qt::ControlModifier ) );
+  mShiftDown = ( event->modifiers() & Qt::ShiftModifier );
+  QToolButton::mouseReleaseEvent( event );
+}
diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h
@@ -21,12 +21,12 @@
 #include <QGroupBox>
 #include <QPointer>
 #include <QToolButton>
-#include <QMouseEvent>
 
 #include "qgis.h"
 #include "qgssettings.h"
 #include "qgis_gui.h"
 
+class QMouseEvent;
 class QToolButton;
 class QScrollArea;
 
@@ -50,12 +50,7 @@ class GUI_EXPORT QgsGroupBoxCollapseButton : public QToolButton
     void setShiftDown( bool shiftdown ) { mShiftDown = shiftdown; }
 
   protected:
-    void mouseReleaseEvent( QMouseEvent *event ) override
-    {
-      mAltDown = ( event->modifiers() & ( Qt::AltModifier | Qt::ControlModifier ) );
-      mShiftDown = ( event->modifiers() & Qt::ShiftModifier );
-      QToolButton::mouseReleaseEvent( event );
-    }
+    void mouseReleaseEvent( QMouseEvent *event ) override;
 
   private:
     bool mAltDown = false;
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -25,7 +25,6 @@ email                : sherman at mrcc.com
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QKeyEvent>
-#include <QMouseEvent>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QPixmap>
diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h
@@ -19,13 +19,10 @@
 #ifndef QGSMAPOVERVIEWCANVAS_H
 #define QGSMAPOVERVIEWCANVAS_H
 
-
-#include <QMouseEvent>
-#include <QWheelEvent>
 #include <QWidget>
-#include <QStringList>
 #include <QPixmap>
 
+class QMouseEvent;
 class QgsMapCanvas;
 class QgsPanningWidget; // defined in .cpp
 class QgsRectangle;
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -34,7 +34,6 @@
 #include <QAction>
 #include <QCursor>
 #include <QPixmap>
-#include <QMouseEvent>
 #include <QStatusBar>
 
 
diff --git a/src/gui/qgsmaptoolemitpoint.cpp b/src/gui/qgsmaptoolemitpoint.cpp
@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QMouseEvent>
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgsmapcanvas.h"
diff --git a/src/gui/qgsmaptoolextent.cpp b/src/gui/qgsmaptoolextent.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 
-#include <QMouseEvent>
 
 #include "qgsmaptoolextent.h"
 #include "qgsmapcanvas.h"
diff --git a/src/gui/qgsmaptoolidentifyfeature.cpp b/src/gui/qgsmaptoolidentifyfeature.cpp
@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QMouseEvent>
 
 #include "qgsmaptoolidentifyfeature.h"
 #include "qgsmapcanvas.h"
diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp
@@ -15,7 +15,6 @@
 
 #include <QBitmap>
 #include <QCursor>
-#include <QMouseEvent>
 
 #include "qgsmaptoolpan.h"
 #include "qgsmapcanvas.h"
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 
-#include <QMouseEvent>
 #include <QRect>
 #include <QColor>
 #include <QCursor>
diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QMouseEvent>
 #include <QCursor>
 #include <QPixmap>
 
diff --git a/src/plugins/georeferencer/qgsgeoreftooladdpoint.h b/src/plugins/georeferencer/qgsgeoreftooladdpoint.h
@@ -16,7 +16,6 @@
 #ifndef QGSGEOREFTOOLADDPOINT_H
 #define QGSGEOREFTOOLADDPOINT_H
 
-#include <QMouseEvent>
 
 #include "qgsmaptoolemitpoint.h"
 
diff --git a/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h b/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h
@@ -16,8 +16,6 @@
 #ifndef QGSGEOREFTOOLDELETEPOINT_H
 #define QGSGEOREFTOOLDELETEPOINT_H
 
-#include <QMouseEvent>
-
 #include "qgsmaptoolemitpoint.h"
 
 class QgsPointXY;
diff --git a/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h b/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h
@@ -16,7 +16,6 @@
 #ifndef QGSGEOREFTOOLMOVEPOINT_H
 #define QGSGEOREFTOOLMOVEPOINT_H
 
-#include <QMouseEvent>
 #include <QRubberBand>
 
 #include "qgsmaptool.h"
diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.h b/src/plugins/georeferencer/qgsmapcoordsdialog.h
@@ -13,7 +13,6 @@
 #define MAPCOORDSDIALOG_H
 
 #include <QDialog>
-#include <QMouseEvent>
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgssnapindicator.h"
diff --git a/tests/src/app/testqgsmaptooladdfeature.cpp b/tests/src/app/testqgsmaptooladdfeature.cpp
@@ -26,6 +26,7 @@
 #include "qgsproject.h"
 #include "qgssettings.h"
 #include "qgsvectorlayer.h"
+#include "qgsmapmouseevent.h"
 #include "testqgsmaptoolutils.h"
 
 
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -32,6 +32,7 @@
 #include "qgsactionmanager.h"
 #include "qgsactionmenu.h"
 #include "qgsidentifyresultsdialog.h"
+#include "qgsmapmouseevent.h"
 
 #include <QTimer>
 
diff --git a/tests/src/app/testqgsmaptoolreverseline.cpp b/tests/src/app/testqgsmaptoolreverseline.cpp
@@ -24,6 +24,7 @@
 
 #include "testqgsmaptoolutils.h"
 #include "qgsmaptoolreverseline.h"
+#include "qgsmapmouseevent.h"
 
 
 class TestQgsMapToolReverseLine : public QObject
diff --git a/tests/src/gui/testqgsmaptoolzoom.cpp b/tests/src/gui/testqgsmaptoolzoom.cpp
@@ -17,12 +17,13 @@
 #include <QString>
 #include <QCoreApplication>
 #include <QWidget>
-#include <QMouseEvent>
 
-#include <qgsmaptoolzoom.h>
-#include <qgsapplication.h>
-#include <qgsmapcanvas.h>
-#include <qgslogger.h>
+#include "qgsmaptoolzoom.h"
+#include "qgsapplication.h"
+#include "qgsmapcanvas.h"
+#include "qgslogger.h"
+#include "qgsmapmouseevent.h"
+
 
 class TestQgsMapToolZoom : public QObject
 {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`
`12`	`12`
	`13`	`+`
`13`	`14`	`class QgsMeshDatasetIndex`
`14`	`15`	`{`
`15`	`16`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`
`11`	`11`
`12`		`-`
`13`	`12`	`class QgsLayoutViewRubberBand : QObject`
`14`	`13`	`{`
`15`	`14`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`
`13`	`13`
`14`		`-`
`15`	`14`	`class QgsMapOverviewCanvas : QWidget`
`16`	`15`	`{`
`17`	`16`	`%Docstring`