remove useless includes

2025-04-14 00:07:35 -04:00 · 2018-10-09 11:11:15 -04:00 · 2018-10-09 11:11:15 -04:00 · f27a5043bb
commit f27a5043bb
parent 7fb3a92994
29 changed files with 32 additions and 43 deletions
--- 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
--- 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
--- 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 );

+
 };


--- a/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in
+++ b/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in
@ -11,7 +11,6 @@



-
 class QgsMapOverviewCanvas : QWidget
 {
 %Docstring
--- 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 )
--- a/src/app/qgsmaptoolannotation.cpp
+++ b/src/app/qgsmaptoolannotation.cpp
@ -16,7 +16,6 @@
 ***************************************************************************/

 #include <QDialog>
-#include <QMouseEvent>

 #include "qgsmaptoolannotation.h"
 #include "qgsannotation.h"
--- 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 )
--- 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
 {
--- 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
 *
--- 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>
--- 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 );
+}
--- 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;
--- 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>
--- 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;
--- a/src/gui/qgsmaptoolcapture.cpp
+++ b/src/gui/qgsmaptoolcapture.cpp
@ -34,7 +34,6 @@
 #include <QAction>
 #include <QCursor>
 #include <QPixmap>
-#include <QMouseEvent>
 #include <QStatusBar>


--- a/src/gui/qgsmaptoolemitpoint.cpp
+++ b/src/gui/qgsmaptoolemitpoint.cpp
@ -13,7 +13,6 @@
 *                                                                         *
 ***************************************************************************/

-#include <QMouseEvent>

 #include "qgsmaptoolemitpoint.h"
 #include "qgsmapcanvas.h"
--- a/src/gui/qgsmaptoolextent.cpp
+++ b/src/gui/qgsmaptoolextent.cpp
@ -14,7 +14,6 @@
 ***************************************************************************/


-#include <QMouseEvent>

 #include "qgsmaptoolextent.h"
 #include "qgsmapcanvas.h"
--- a/src/gui/qgsmaptoolidentifyfeature.cpp
+++ b/src/gui/qgsmaptoolidentifyfeature.cpp
@ -13,7 +13,6 @@
 *                                                                         *
 ***************************************************************************/

-#include <QMouseEvent>

 #include "qgsmaptoolidentifyfeature.h"
 #include "qgsmapcanvas.h"
--- 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"
--- a/src/gui/qgsmaptoolzoom.cpp
+++ b/src/gui/qgsmaptoolzoom.cpp
@ -14,7 +14,6 @@
 ***************************************************************************/


-#include <QMouseEvent>
 #include <QRect>
 #include <QColor>
 #include <QCursor>
--- 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>

--- 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"

--- 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;
--- 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"
--- 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"
--- 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"


--- 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>

--- 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
--- 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
 {