From f27a5043bb652e17c7ddd68149d11b300440f3c2 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 9 Oct 2018 11:11:15 -0400 Subject: [PATCH] remove useless includes --- .../auto_generated/mesh/qgsmeshdataprovider.sip.in | 1 + .../layout/qgslayoutviewrubberband.sip.in | 1 - .../gui/auto_generated/qgscollapsiblegroupbox.sip.in | 1 + python/gui/auto_generated/qgsmapoverviewcanvas.sip.in | 1 - src/app/qgsmaptooladdfeature.cpp | 1 - src/app/qgsmaptoolannotation.cpp | 1 - src/app/qgsmaptooldigitizefeature.cpp | 1 - src/core/mesh/qgsmeshdataprovider.cpp | 7 +++++-- src/core/mesh/qgsmeshdataprovider.h | 11 ++++++----- src/gui/layout/qgslayoutviewrubberband.h | 2 -- src/gui/qgscollapsiblegroupbox.cpp | 7 +++++++ src/gui/qgscollapsiblegroupbox.h | 9 ++------- src/gui/qgsmapcanvas.cpp | 1 - src/gui/qgsmapoverviewcanvas.h | 5 +---- src/gui/qgsmaptoolcapture.cpp | 1 - src/gui/qgsmaptoolemitpoint.cpp | 1 - src/gui/qgsmaptoolextent.cpp | 1 - src/gui/qgsmaptoolidentifyfeature.cpp | 1 - src/gui/qgsmaptoolpan.cpp | 1 - src/gui/qgsmaptoolzoom.cpp | 1 - .../coordinate_capture/coordinatecapturemaptool.cpp | 1 - src/plugins/georeferencer/qgsgeoreftooladdpoint.h | 1 - src/plugins/georeferencer/qgsgeoreftooldeletepoint.h | 2 -- src/plugins/georeferencer/qgsgeoreftoolmovepoint.h | 1 - src/plugins/georeferencer/qgsmapcoordsdialog.h | 1 - tests/src/app/testqgsmaptooladdfeature.cpp | 1 + tests/src/app/testqgsmaptoolidentifyaction.cpp | 1 + tests/src/app/testqgsmaptoolreverseline.cpp | 1 + tests/src/gui/testqgsmaptoolzoom.cpp | 11 ++++++----- 29 files changed, 32 insertions(+), 43 deletions(-) diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in index 736a76518ca..e8333b4a73d 100644 --- 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 index e8f5d14e5a7..f3def63c1f4 100644 --- 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 index d894dbcab6d..707ef5b73eb 100644 --- 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 index 4c5a2511c37..3cabc6c457b 100644 --- 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 index 5af4f23c309..75c9c82674b 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -33,7 +33,6 @@ #include "qgsfeatureaction.h" #include "qgisapp.h" -#include #include QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mode ) diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp index 14ab6ff3c48..9870aa20428 100644 --- a/src/app/qgsmaptoolannotation.cpp +++ b/src/app/qgsmaptoolannotation.cpp @@ -16,7 +16,6 @@ ***************************************************************************/ #include -#include #include "qgsmaptoolannotation.h" #include "qgsannotation.h" diff --git a/src/app/qgsmaptooldigitizefeature.cpp b/src/app/qgsmaptooldigitizefeature.cpp index 7376132a644..3a35258976d 100644 --- a/src/app/qgsmaptooldigitizefeature.cpp +++ b/src/app/qgsmaptooldigitizefeature.cpp @@ -34,7 +34,6 @@ #include "qgsfeatureaction.h" #include "qgisapp.h" -#include #include QgsMapToolDigitizeFeature::QgsMapToolDigitizeFeature( QgsMapCanvas *canvas, QgsMapLayer *layer, CaptureMode mode ) diff --git a/src/core/mesh/qgsmeshdataprovider.cpp b/src/core/mesh/qgsmeshdataprovider.cpp index 0870c1fa477..42d06893010 100644 --- 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 index 59cab40f316..3811541fa03 100644 --- 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 #include #include #include +#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 index 1208daee33c..69ad553c7e8 100644 --- a/src/gui/layout/qgslayoutviewrubberband.h +++ b/src/gui/layout/qgslayoutviewrubberband.h @@ -16,8 +16,6 @@ #ifndef QGSLAYOUTVIEWRUBBERBAND_H #define QGSLAYOUTVIEWRUBBERBAND_H -#include - #include "qgis_gui.h" #include "qgis_sip.h" #include diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp index 40c7855c4e2..1864128ab7a 100644 --- 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 index 5bf1a267ecd..660d828b1c1 100644 --- a/src/gui/qgscollapsiblegroupbox.h +++ b/src/gui/qgscollapsiblegroupbox.h @@ -21,12 +21,12 @@ #include #include #include -#include #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 index d365de8a89a..e1f8def726b 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -25,7 +25,6 @@ email : sherman at mrcc.com #include #include #include -#include #include #include #include diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h index 6ed54e725e3..14d124c8b3f 100644 --- a/src/gui/qgsmapoverviewcanvas.h +++ b/src/gui/qgsmapoverviewcanvas.h @@ -19,13 +19,10 @@ #ifndef QGSMAPOVERVIEWCANVAS_H #define QGSMAPOVERVIEWCANVAS_H - -#include -#include #include -#include #include +class QMouseEvent; class QgsMapCanvas; class QgsPanningWidget; // defined in .cpp class QgsRectangle; diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp index f4a5667d13d..562022e8d60 100644 --- a/src/gui/qgsmaptoolcapture.cpp +++ b/src/gui/qgsmaptoolcapture.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include diff --git a/src/gui/qgsmaptoolemitpoint.cpp b/src/gui/qgsmaptoolemitpoint.cpp index 3c986bd0a2a..b26a94ca803 100644 --- a/src/gui/qgsmaptoolemitpoint.cpp +++ b/src/gui/qgsmaptoolemitpoint.cpp @@ -13,7 +13,6 @@ * * ***************************************************************************/ -#include #include "qgsmaptoolemitpoint.h" #include "qgsmapcanvas.h" diff --git a/src/gui/qgsmaptoolextent.cpp b/src/gui/qgsmaptoolextent.cpp index c572a3c5e98..60df3f19d76 100644 --- a/src/gui/qgsmaptoolextent.cpp +++ b/src/gui/qgsmaptoolextent.cpp @@ -14,7 +14,6 @@ ***************************************************************************/ -#include #include "qgsmaptoolextent.h" #include "qgsmapcanvas.h" diff --git a/src/gui/qgsmaptoolidentifyfeature.cpp b/src/gui/qgsmaptoolidentifyfeature.cpp index 99f8642d3ef..8226cb164de 100644 --- a/src/gui/qgsmaptoolidentifyfeature.cpp +++ b/src/gui/qgsmaptoolidentifyfeature.cpp @@ -13,7 +13,6 @@ * * ***************************************************************************/ -#include #include "qgsmaptoolidentifyfeature.h" #include "qgsmapcanvas.h" diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp index df91ceb1e09..b1f0552b368 100644 --- a/src/gui/qgsmaptoolpan.cpp +++ b/src/gui/qgsmaptoolpan.cpp @@ -15,7 +15,6 @@ #include #include -#include #include "qgsmaptoolpan.h" #include "qgsmapcanvas.h" diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp index f5e8c32abba..7c8454df34a 100644 --- a/src/gui/qgsmaptoolzoom.cpp +++ b/src/gui/qgsmaptoolzoom.cpp @@ -14,7 +14,6 @@ ***************************************************************************/ -#include #include #include #include diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp index 05aa3dd2e1c..29e6e8eeaa2 100644 --- a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp +++ b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp @@ -14,7 +14,6 @@ ***************************************************************************/ #include -#include #include #include diff --git a/src/plugins/georeferencer/qgsgeoreftooladdpoint.h b/src/plugins/georeferencer/qgsgeoreftooladdpoint.h index cf446e0edbe..1bf4bc608ec 100644 --- a/src/plugins/georeferencer/qgsgeoreftooladdpoint.h +++ b/src/plugins/georeferencer/qgsgeoreftooladdpoint.h @@ -16,7 +16,6 @@ #ifndef QGSGEOREFTOOLADDPOINT_H #define QGSGEOREFTOOLADDPOINT_H -#include #include "qgsmaptoolemitpoint.h" diff --git a/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h b/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h index 4a6a88caf22..5891eda9117 100644 --- a/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h +++ b/src/plugins/georeferencer/qgsgeoreftooldeletepoint.h @@ -16,8 +16,6 @@ #ifndef QGSGEOREFTOOLDELETEPOINT_H #define QGSGEOREFTOOLDELETEPOINT_H -#include - #include "qgsmaptoolemitpoint.h" class QgsPointXY; diff --git a/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h b/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h index 63d92cb3d74..0f0cbf8b7c9 100644 --- a/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h +++ b/src/plugins/georeferencer/qgsgeoreftoolmovepoint.h @@ -16,7 +16,6 @@ #ifndef QGSGEOREFTOOLMOVEPOINT_H #define QGSGEOREFTOOLMOVEPOINT_H -#include #include #include "qgsmaptool.h" diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.h b/src/plugins/georeferencer/qgsmapcoordsdialog.h index 7138ca7ed9a..151ac167fd8 100644 --- a/src/plugins/georeferencer/qgsmapcoordsdialog.h +++ b/src/plugins/georeferencer/qgsmapcoordsdialog.h @@ -13,7 +13,6 @@ #define MAPCOORDSDIALOG_H #include -#include #include "qgsmaptoolemitpoint.h" #include "qgssnapindicator.h" diff --git a/tests/src/app/testqgsmaptooladdfeature.cpp b/tests/src/app/testqgsmaptooladdfeature.cpp index cba6d78ed62..28a14dc77a3 100644 --- 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 index 083a7162e86..fc482a8dd63 100644 --- 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 diff --git a/tests/src/app/testqgsmaptoolreverseline.cpp b/tests/src/app/testqgsmaptoolreverseline.cpp index a893c127cb2..1590d72fcff 100644 --- 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 index 8e2ea6fdc05..7e18babf048 100644 --- a/tests/src/gui/testqgsmaptoolzoom.cpp +++ b/tests/src/gui/testqgsmaptoolzoom.cpp @@ -17,12 +17,13 @@ #include #include #include -#include -#include -#include -#include -#include +#include "qgsmaptoolzoom.h" +#include "qgsapplication.h" +#include "qgsmapcanvas.h" +#include "qgslogger.h" +#include "qgsmapmouseevent.h" + class TestQgsMapToolZoom : public QObject {