forward declaration of QgsMapMouseEvent

python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in

@@ -11,6 +11,7 @@
 
 
 
+
 class QgsAdvancedDigitizingDockWidget : QgsDockWidget
 {
 %Docstring

src/app/qgsmaptooladdpart.cpp

@@ -24,8 +24,8 @@
 #include "qgsvectorlayer.h"
 #include "qgslogger.h"
 #include "qgisapp.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), CaptureNone )

src/app/qgsmaptooladdring.cpp

@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QMouseEvent>
 
 #include "qgsmaptooladdring.h"
 #include "qgsgeometry.h"
@@ -23,6 +22,7 @@
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgisapp.h"
+#include "qgsmapmouseevent.h"
 
 
 QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas *canvas )

src/app/qgsmaptoolannotation.cpp

@@ -15,6 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QDialog>
+#include <QMouseEvent>
+
 #include "qgsmaptoolannotation.h"
 #include "qgsannotation.h"
 #include "qgsformannotationdialog.h"
@@ -30,8 +33,8 @@
 #include "qgsproject.h"
 #include "qgsexception.h"
 #include "qgsannotationmanager.h"
-#include <QDialog>
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas *canvas )
   : QgsMapTool( canvas )

src/app/qgsmaptoolchangelabelproperties.cpp

@@ -20,6 +20,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
+#include "qgsmapmouseevent.h"
 
 QgsMapToolChangeLabelProperties::QgsMapToolChangeLabelProperties( QgsMapCanvas *canvas ): QgsMapToolLabel( canvas )
 {

src/app/qgsmaptoolcircle2points.cpp

@@ -18,7 +18,8 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolCircle2Points::QgsMapToolCircle2Points( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcircle2tangentspoint.cpp

@@ -27,7 +27,7 @@
 #include "qgsspinbox.h"
 #include "qgsgeometryutils.h"
 #include <memory>
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 QgsMapToolCircle2TangentsPoint::QgsMapToolCircle2TangentsPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcircle3points.cpp

@@ -19,7 +19,7 @@
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 QgsMapToolCircle3Points::QgsMapToolCircle3Points( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcircle3tangents.cpp

@@ -22,7 +22,8 @@
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
 #include "qgisapp.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcirclecenterpoint.cpp

@@ -18,13 +18,13 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolCircleCenterPoint::QgsMapToolCircleCenterPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )
   : QgsMapToolAddCircle( parentTool, canvas, mode )
 {
-
 }
 
 void QgsMapToolCircleCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

src/app/qgsmaptoolcircularstringcurvepoint.cpp

@@ -18,7 +18,8 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolCircularStringCurvePoint::QgsMapToolCircularStringCurvePoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcircularstringradius.cpp

@@ -22,8 +22,9 @@
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
 #include "qgsstatusbar.h"
+#include "qgsmapmouseevent.h"
+
 #include <QDoubleSpinBox>
-#include <QMouseEvent>
 #include <cmath>
 
 QgsMapToolCircularStringRadius::QgsMapToolCircularStringRadius( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptooldeletepart.cpp

@@ -24,8 +24,7 @@
 #include "qgssnappingutils.h"
 #include "qgstolerance.h"
 #include "qgisapp.h"
-
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 QgsMapToolDeletePart::QgsMapToolDeletePart( QgsMapCanvas *canvas )
   : QgsMapToolEdit( canvas )

src/app/qgsmaptooldeletepart.h

@@ -18,6 +18,8 @@
 
 #include "qgsmaptooledit.h"
 #include "qgis_app.h"
+#include "qgsfeatureid.h"
+#include "qgsgeometry.h"
 
 class QgsVertexMarker;
 

src/app/qgsmaptooldeletering.cpp

@@ -22,10 +22,11 @@
 #include "qgsvectorlayer.h"
 #include "qgisapp.h"
 #include "qgsrubberband.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 #include <limits>
 
+
 QgsMapToolDeleteRing::QgsMapToolDeleteRing( QgsMapCanvas *canvas )
   : QgsMapToolEdit( canvas )
   , mPressedFid( 0 )

src/app/qgsmaptooldeletering.h

@@ -18,6 +18,9 @@
 
 #include "qgsmaptooledit.h"
 #include "qgis_app.h"
+#include "qgsgeometry.h"
+#include "qgsfeatureid.h"
+
 
 class QgsVertexMarker;
 //! Map tool to delete vertices from line/polygon features

src/app/qgsmaptoolellipsecenter2points.cpp

@@ -19,7 +19,7 @@
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 #include <memory>
 
 QgsMapToolEllipseCenter2Points::QgsMapToolEllipseCenter2Points( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolellipsecenterpoint.cpp

@@ -18,7 +18,8 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolEllipseCenterPoint::QgsMapToolEllipseCenterPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolellipseextent.cpp

@@ -20,7 +20,8 @@
 #include "qgspoint.h"
 #include "qgsgeometryutils.h"
 #include "qgslinestring.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolEllipseExtent::QgsMapToolEllipseExtent( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolellipsefoci.cpp

@@ -19,7 +19,7 @@
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 #include <memory>
 
 QgsMapToolEllipseFoci::QgsMapToolEllipseFoci( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolfeatureaction.cpp

@@ -33,9 +33,9 @@
 #include "qgisapp.h"
 #include "qgsgui.h"
 #include "qgsstatusbar.h"
+#include "qgsmapmouseevent.h"
 
 #include <QSettings>
-#include <QMouseEvent>
 #include <QStatusBar>
 
 QgsMapToolFeatureAction::QgsMapToolFeatureAction( QgsMapCanvas *canvas )

src/app/qgsmaptoolfillring.cpp

@@ -22,8 +22,8 @@
 #include "qgsattributedialog.h"
 #include "qgisapp.h"
 #include "qgsvectorlayerutils.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 #include <limits>
 
 QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas *canvas )

src/app/qgsmaptoolidentifyaction.cpp

@@ -39,9 +39,9 @@
 #include "qgsstatusbar.h"
 #include "qgsactionscoperegistry.h"
 #include "qgsproxyprogresstask.h"
-
 #include "qgssettings.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 #include <QCursor>
 #include <QPixmap>
 #include <QStatusBar>

src/app/qgsmaptoolmeasureangle.cpp

@@ -24,8 +24,8 @@
 #include "qgssnappingutils.h"
 #include "qgssettings.h"
 #include "qgssnapindicator.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 #include <cmath>
 
 QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas *canvas )

src/app/qgsmaptoolmovefeature.cpp

@@ -25,9 +25,9 @@
 #include "qgsvectorlayer.h"
 #include "qgsvectorlayertools.h"
 #include "qgssnapindicator.h"
+#include "qgsmapmouseevent.h"
 
 #include <QMessageBox>
-#include <QMouseEvent>
 #include <QSettings>
 #include <limits>
 

src/app/qgsmaptoolmovefeature.h

@@ -18,6 +18,8 @@
 
 #include "qgsmaptooladvanceddigitizing.h"
 #include "qgis_app.h"
+#include "qgspointxy.h"
+#include "qgsfeatureid.h"
 
 class QgsSnapIndicator;
 

src/app/qgsmaptoolmovelabel.cpp

@@ -19,7 +19,8 @@
 #include "qgsmapcanvas.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolMoveLabel::QgsMapToolMoveLabel( QgsMapCanvas *canvas )
   : QgsMapToolLabel( canvas )

src/app/qgsmaptooloffsetcurve.cpp

@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include <QGraphicsProxyWidget>
-#include <QMouseEvent>
 #include <QGridLayout>
 #include <QLabel>
 
@@ -30,7 +29,7 @@
 #include "qgssnappingconfig.h"
 #include "qgssettings.h"
 #include "qgisapp.h"
-
+#include "qgsmapmouseevent.h"
 #include "qgslogger.h"
 
 QgsMapToolOffsetCurve::QgsMapToolOffsetCurve( QgsMapCanvas *canvas )

src/app/qgsmaptooloffsetcurve.h

@@ -20,6 +20,7 @@
 #include "qgsgeometry.h"
 #include "qgis_app.h"
 #include "ui_qgsoffsetuserinputwidget.h"
+#include "qgspointlocator.h"
 
 class QGridLayout;
 

src/app/qgsmaptooloffsetpointsymbol.cpp

@@ -25,9 +25,9 @@
 #include "qgisapp.h"
 #include "qgsproperty.h"
 #include "qgssymbollayerutils.h"
+#include "qgsmapmouseevent.h"
 
 #include <QGraphicsPixmapItem>
-#include <QMouseEvent>
 
 QgsMapToolOffsetPointSymbol::QgsMapToolOffsetPointSymbol( QgsMapCanvas *canvas )
   : QgsMapToolPointSymbol( canvas )

src/app/qgsmaptoolpinlabels.cpp

@@ -22,11 +22,11 @@
 #include "qgsmapcanvas.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
-
+#include "qgsmapmouseevent.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsrubberband.h"
 #include "qgslogger.h"
-#include <QMouseEvent>
+
 
 QgsMapToolPinLabels::QgsMapToolPinLabels( QgsMapCanvas *canvas )
   : QgsMapToolLabel( canvas )

src/app/qgsmaptoolpointsymbol.cpp

@@ -19,8 +19,8 @@
 #include "qgsvectorlayer.h"
 #include "qgsmapcanvas.h"
 #include "qgssnappingutils.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolPointSymbol::QgsMapToolPointSymbol( QgsMapCanvas *canvas )
   : QgsMapToolEdit( canvas )

src/app/qgsmaptoolrectangle3points.cpp

@@ -20,7 +20,7 @@
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 #include <memory>
 
 QgsMapToolRectangle3Points::QgsMapToolRectangle3Points( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolrectanglecenter.cpp

@@ -20,7 +20,8 @@
 #include "qgsmapcanvas.h"
 #include "qgslinestring.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 #include <memory>
 
 QgsMapToolRectangleCenter::QgsMapToolRectangleCenter( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolrectangleextent.cpp

@@ -20,7 +20,7 @@
 #include "qgsmapcanvas.h"
 #include "qgslinestring.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 #include <memory>
 
 QgsMapToolRectangleExtent::QgsMapToolRectangleExtent( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolregularpolygon2points.cpp

@@ -18,7 +18,7 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 QgsMapToolRegularPolygon2Points::QgsMapToolRegularPolygon2Points( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolregularpolygoncentercorner.cpp

@@ -18,7 +18,8 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 QgsMapToolRegularPolygonCenterCorner::QgsMapToolRegularPolygonCenterCorner( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolregularpolygoncenterpoint.cpp

@@ -18,7 +18,7 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 QgsMapToolRegularPolygonCenterPoint::QgsMapToolRegularPolygonCenterPoint( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolreshape.cpp

@@ -21,8 +21,8 @@
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
 #include "qgisapp.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolReshape::QgsMapToolReshape( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), QgsMapToolCapture::CaptureLine )

src/app/qgsmaptoolreverseline.cpp

@@ -26,8 +26,8 @@
 #include "qgisapp.h"
 #include "qgslinestring.h"
 #include "qgsmultilinestring.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolReverseLine::QgsMapToolReverseLine( QgsMapCanvas *canvas )
   : QgsMapToolEdit( canvas )

src/app/qgsmaptoolreverseline.h

@@ -18,6 +18,9 @@
 
 #include "qgsmaptooledit.h"
 #include "qgis_app.h"
+#include "qgsgeometry.h"
+#include "qgsfeatureid.h"
+
 
 class QgsVertexMarker;
 

src/app/qgsmaptoolrotatefeature.cpp

@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QMouseEvent>
 #include <QSettings>
 #include <QEvent>
 #include <QHBoxLayout>
@@ -34,6 +33,7 @@
 #include "qgisapp.h"
 #include "qgsspinbox.h"
 #include "qgsdoublespinbox.h"
+#include "qgsmapmouseevent.h"
 
 
 QgsAngleMagnetWidget::QgsAngleMagnetWidget( const QString &label, QWidget *parent )

src/app/qgsmaptoolrotatefeature.h

@@ -21,6 +21,8 @@
 #include "qgsmaptooledit.h"
 #include "qgsvertexmarker.h"
 #include "qgis_app.h"
+#include "qgsgeometry.h"
+#include "qgsfeatureid.h"
 
 class QgsDoubleSpinBox;
 class QHBoxLayout;

src/app/qgsmaptoolrotatelabel.cpp

@@ -21,7 +21,7 @@
 #include "qgspointrotationitem.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 #include "qgisapp.h"
 #include "qgsapplication.h"

src/app/qgsmaptoolrotatepointsymbols.cpp

@@ -23,9 +23,11 @@
 #include "qgsvectorlayer.h"
 #include "qgsproperty.h"
 #include "qgisapp.h"
+#include "qgsmapmouseevent.h"
+
 
 #include <QGraphicsPixmapItem>
-#include <QMouseEvent>
+
 
 QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas *canvas )
   : QgsMapToolPointSymbol( canvas )

src/app/qgsmaptoolshowhidelabels.cpp

@@ -22,12 +22,11 @@
 #include "qgsfeatureiterator.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
-
+#include "qgsmapmouseevent.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsrubberband.h"
 #include "qgslogger.h"
 
-#include <QMouseEvent>
 
 QgsMapToolShowHideLabels::QgsMapToolShowHideLabels( QgsMapCanvas *canvas )
   : QgsMapToolLabel( canvas )

src/app/qgsmaptoolsimplify.cpp

@@ -26,7 +26,7 @@
 #include "qgisapp.h"
 #include "qgssettings.h"
 #include "qgsmaptopixelgeometrysimplifier.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 #include <cmath>
 #include <cfloat>

src/app/qgsmaptoolsplitfeatures.cpp

@@ -20,8 +20,8 @@
 #include "qgsproject.h"
 #include "qgssnappingutils.h"
 #include "qgsvectorlayer.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolSplitFeatures::QgsMapToolSplitFeatures( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), QgsMapToolCapture::CaptureLine )

src/app/qgsmaptoolsplitparts.cpp

@@ -20,8 +20,8 @@
 #include "qgsmaptoolsplitparts.h"
 #include "qgssnappingutils.h"
 #include "qgsvectorlayer.h"
+#include "qgsmapmouseevent.h"
 
-#include <QMouseEvent>
 
 QgsMapToolSplitParts::QgsMapToolSplitParts( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), QgsMapToolCapture::CaptureLine )

src/app/qgsmeasuretool.cpp

@@ -28,9 +28,10 @@
 #include "qgssettings.h"
 #include "qgsproject.h"
 #include "qgssnapindicator.h"
+#include "qgsmapmouseevent.h"
 
 #include <QMessageBox>
-#include <QMouseEvent>
+
 
 QgsMeasureTool::QgsMeasureTool( QgsMapCanvas *canvas, bool measureArea )
   : QgsMapTool( canvas )

src/app/qgsmeasuretool.h

@@ -18,6 +18,7 @@
 #define QGSMEASURETOOL_H
 
 #include "qgsmaptool.h"
+#include "qgscoordinatereferencesystem.h"
 #include "qgis_app.h"
 
 class QgsDistanceArea;

src/app/vertextool/qgsvertextool.cpp

@@ -37,6 +37,7 @@
 #include "qgsselectedfeature.h"
 #include "qgsvertexeditor.h"
 #include "qgsvertexentry.h"
+#include "qgsmapmouseevent.h"
 
 #include <QMenu>
 #include <QRubberBand>

src/app/vertextool/qgsvertextool.h

@@ -21,6 +21,8 @@
 #include "qgis_app.h"
 #include "qgsmaptooladvanceddigitizing.h"
 #include "qgsgeometry.h"
+#include "qgspointlocator.h"
+
 
 class QRubberBand;
 

src/core/qgstolerance.cpp

@@ -16,6 +16,7 @@
 #include "qgstolerance.h"
 #include "qgsmapsettings.h"
 #include "qgssettings.h"
+#include "qgspointxy.h"
 
 #include <QPoint>
 #include <cmath>

src/gui/qgsadvanceddigitizingdockwidget.cpp

@@ -27,12 +27,12 @@
 #include "qgsmaptoolcapture.h"
 #include "qgsmaptooladvanceddigitizing.h"
 #include "qgsmessagebaritem.h"
-#include "qgspointxy.h"
 #include "qgslinestring.h"
 #include "qgsfocuswatcher.h"
 #include "qgssettings.h"
 #include "qgssnappingutils.h"
 #include "qgsproject.h"
+#include "qgsmapmouseevent.h"
 
 
 QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent )

src/gui/qgsadvanceddigitizingdockwidget.h

@@ -16,21 +16,23 @@
 #ifndef QGSADVANCEDDIGITIZINGDOCK
 #define QGSADVANCEDDIGITIZINGDOCK
 
-#include "qgsdockwidget.h"
-#include "qgsmapmouseevent.h"
-#include "qgsmessagebaritem.h"
+#include <QList>
+
+#include <memory>
 
 #include "ui_qgsadvanceddigitizingdockwidgetbase.h"
 #include "qgis_gui.h"
 #include "qgis.h"
-#include <memory>
+#include "qgsdockwidget.h"
+#include "qgsmessagebaritem.h"
+#include "qgspointxy.h"
 
 
 class QgsAdvancedDigitizingCanvasItem;
 class QgsMapCanvas;
 class QgsMapTool;
 class QgsMapToolAdvancedDigitizing;
-class QgsPointXY;
+class QgsMapMouseEvent;
 
 /**
  * \ingroup gui

src/gui/qgsmapcanvas.cpp

@@ -48,6 +48,7 @@ email                : sherman at mrcc.com
 #include "qgsmapcanvasmap.h"
 #include "qgsmapcanvassnappingutils.h"
 #include "qgsmaplayer.h"
+#include "qgsmapmouseevent.h"
 #include "qgsmaptoolpan.h"
 #include "qgsmaptoolzoom.h"
 #include "qgsmaptopixel.h"

src/gui/qgsmaptool.cpp

@@ -19,6 +19,7 @@
 #include "qgsmaptopixel.h"
 #include "qgsrendercontext.h"
 #include "qgssettings.h"
+#include "qgsmapmouseevent.h"
 
 #include <QAction>
 #include <QAbstractButton>

src/gui/qgsmaptool.h

@@ -19,7 +19,6 @@
 #include "qgsconfig.h"
 #include "qgis.h"
 #include "qgsmessagebar.h"
-#include "qgsmapmouseevent.h"
 
 #include <QCursor>
 #include <QString>
@@ -40,6 +39,7 @@ class QgsRectangle;
 class QPoint;
 class QAction;
 class QAbstractButton;
+class QgsMapMouseEvent;
 
 #ifdef SIP_RUN
 % ModuleHeaderCode

src/gui/qgsmaptoolcapture.h

@@ -18,6 +18,7 @@
 
 
 #include "qgsmaptooladvanceddigitizing.h"
+#include "qgspointlocator.h"
 #include "qgscompoundcurve.h"
 #include "qgsgeometry.h"
 

src/gui/qgsmaptoolemitpoint.cpp

@@ -13,10 +13,12 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QMouseEvent>
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgsmapcanvas.h"
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
+
 
 
 QgsMapToolEmitPoint::QgsMapToolEmitPoint( QgsMapCanvas *canvas )

src/gui/qgsmaptoolextent.cpp

@@ -13,11 +13,13 @@
  *                                                                         *
  ***************************************************************************/
 
+
+#include <QMouseEvent>
+
 #include "qgsmaptoolextent.h"
 #include "qgsmapcanvas.h"
 #include "qgswkbtypes.h"
-
-#include <QMouseEvent>
+#include "qgsmapmouseevent.h"
 
 
 QgsMapToolExtent::QgsMapToolExtent( QgsMapCanvas *canvas )

src/gui/qgsmaptoolidentifyfeature.cpp

@@ -17,6 +17,7 @@
 
 #include "qgsmaptoolidentifyfeature.h"
 #include "qgsmapcanvas.h"
+#include "qgsmapmouseevent.h"
 
 QgsMapToolIdentifyFeature::QgsMapToolIdentifyFeature( QgsMapCanvas *canvas, QgsVectorLayer *vl )
   : QgsMapToolIdentify( canvas )

src/gui/qgsmaptoolpan.cpp

@@ -13,13 +13,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsmaptoolpan.h"
-#include "qgsmapcanvas.h"
-#include "qgsmaptopixel.h"
 #include <QBitmap>
 #include <QCursor>
 #include <QMouseEvent>
 
+#include "qgsmaptoolpan.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaptopixel.h"
+#include "qgsmapmouseevent.h"
+
+
 
 QgsMapToolPan::QgsMapToolPan( QgsMapCanvas *canvas )
   : QgsMapTool( canvas )

src/gui/qgsmaptoolzoom.cpp

@@ -13,17 +13,20 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsmaptoolzoom.h"
-#include "qgsmapcanvas.h"
-#include "qgsmaptopixel.h"
-#include "qgsrubberband.h"
 
 #include <QMouseEvent>
 #include <QRect>
 #include <QColor>
 #include <QCursor>
 #include <QPixmap>
+
+#include "qgsmaptoolzoom.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaptopixel.h"
+#include "qgsrubberband.h"
 #include "qgslogger.h"
+#include "qgsmapmouseevent.h"
+
 
 
 QgsMapToolZoom::QgsMapToolZoom( QgsMapCanvas *canvas, bool zoomOut )

src/plugins/coordinate_capture/coordinatecapturemaptool.cpp

@@ -13,17 +13,18 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QSettings>
+#include <QMouseEvent>
+#include <QCursor>
+#include <QPixmap>
+
 #include "coordinatecapturemaptool.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaptopixel.h"
 #include "qgsrubberband.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgsmapmouseevent.h"
 
-#include <QSettings>
-
-#include <QMouseEvent>
-#include <QCursor>
-#include <QPixmap>
 
 CoordinateCaptureMapTool::CoordinateCaptureMapTool( QgsMapCanvas *thepCanvas )
   : QgsMapTool( thepCanvas )

src/plugins/evis/idtool/eviseventidtool.cpp

@@ -1,4 +1,5 @@
 /*
+ *
 ** File: eviseventidtool.cpp
 ** Author: Peter J. Ersts ( ersts at amnh.org )
 ** Creation Date: 2007-03-19
@@ -24,6 +25,11 @@
 ** National Oceanic and Atmospheric Administration or the Department of Commerce.
 **
 **/
+
+
+#include <QObject>
+#include <QMessageBox>
+
 #include "eviseventidtool.h"
 
 #include "qgsmaptopixel.h"
@@ -31,9 +37,8 @@
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsfeatureiterator.h"
+#include "qgsmapmouseevent.h"
 
-#include <QObject>
-#include <QMessageBox>
 
 /**
 * Constructor for the id style tool, this tool inherits the QgsMapTool and requires a pointer to

src/plugins/georeferencer/qgsgeoreftooladdpoint.cpp

@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include "qgsmapcanvas.h"
-
 #include "qgsgeoreftooladdpoint.h"
+#include "qgsmapmouseevent.h"
 
 QgsGeorefToolAddPoint::QgsGeorefToolAddPoint( QgsMapCanvas *canvas )
   : QgsMapToolEmitPoint( canvas )

src/plugins/georeferencer/qgsgeoreftooldeletepoint.cpp

@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include "qgsmapcanvas.h"
-
 #include "qgsgeoreftooldeletepoint.h"
+#include "qgsmapmouseevent.h"
 
 QgsGeorefToolDeletePoint::QgsGeorefToolDeletePoint( QgsMapCanvas *canvas )
   : QgsMapToolEmitPoint( canvas )

src/plugins/georeferencer/qgsgeoreftoolmovepoint.cpp

@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmapcanvas.h"
-
+#include "qgsmapmouseevent.h"
 #include "qgsgeoreftoolmovepoint.h"
 
 QgsGeorefToolMovePoint::QgsGeorefToolMovePoint( QgsMapCanvas *canvas )

src/plugins/georeferencer/qgsmapcoordsdialog.cpp

@@ -19,6 +19,7 @@
 #include "qgsgeorefvalidators.h"
 #include "qgsmapcoordsdialog.h"
 #include "qgssettings.h"
+#include "qgsmapmouseevent.h"
 
 QgsMapCoordsDialog::QgsMapCoordsDialog( QgsMapCanvas *qgisCanvas, const QgsPointXY &pixelCoords, QWidget *parent )
   : QDialog( parent, Qt::Dialog )
@@ -152,3 +153,39 @@ double QgsMapCoordsDialog::dmsToDD( const QString &dms )
   else
     return res;
 }
+
+QgsGeorefMapToolEmitPoint::QgsGeorefMapToolEmitPoint( QgsMapCanvas *canvas )
+  : QgsMapTool( canvas )
+{
+  mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
+}
+
+void QgsGeorefMapToolEmitPoint::canvasMoveEvent( QgsMapMouseEvent *e )
+{
+  mSnapIndicator->setMatch( mapPointMatch( e ) );
+}
+
+void QgsGeorefMapToolEmitPoint::canvasPressEvent( QgsMapMouseEvent *e )
+{
+  QgsPointLocator::Match m = mapPointMatch( e );
+  emit canvasClicked( m.isValid() ? m.point() : toMapCoordinates( e->pos() ), e->button() );
+}
+
+void QgsGeorefMapToolEmitPoint::canvasReleaseEvent( QgsMapMouseEvent *e )
+{
+  QgsMapTool::canvasReleaseEvent( e );
+  emit mouseReleased();
+}
+
+void QgsGeorefMapToolEmitPoint::deactivate()
+{
+  mSnapIndicator->setMatch( QgsPointLocator::Match() );
+
+  QgsMapTool::deactivate();
+}
+
+QgsPointLocator::Match QgsGeorefMapToolEmitPoint::mapPointMatch( QMouseEvent *e )
+{
+  QgsPointXY pnt = toMapCoordinates( e->pos() );
+  return canvas()->snappingUtils()->snapToMap( pnt );
+}

src/plugins/georeferencer/qgsmapcoordsdialog.h

@@ -20,6 +20,8 @@
 #include "qgssnappingutils.h"
 #include "qgspointxy.h"
 #include "qgsmapcanvas.h"
+#include "qgspointlocator.h"
+
 
 #include "ui_qgsmapcoordsdialogbase.h"
 
@@ -30,35 +32,15 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool
     Q_OBJECT
 
   public:
-    explicit QgsGeorefMapToolEmitPoint( QgsMapCanvas *canvas )
-      : QgsMapTool( canvas )
-    {
-      mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
-    }
+    explicit QgsGeorefMapToolEmitPoint( QgsMapCanvas *canvas );
 
-    void canvasMoveEvent( QgsMapMouseEvent *e ) override
-    {
-      mSnapIndicator->setMatch( mapPointMatch( e ) );
-    }
+    void canvasMoveEvent( QgsMapMouseEvent *e ) override;
 
-    void canvasPressEvent( QgsMapMouseEvent *e ) override
-    {
-      QgsPointLocator::Match m = mapPointMatch( e );
-      emit canvasClicked( m.isValid() ? m.point() : toMapCoordinates( e->pos() ), e->button() );
-    }
+    void canvasPressEvent( QgsMapMouseEvent *e ) override;
 
-    void canvasReleaseEvent( QgsMapMouseEvent *e ) override
-    {
-      QgsMapTool::canvasReleaseEvent( e );
-      emit mouseReleased();
-    }
+    void canvasReleaseEvent( QgsMapMouseEvent *e ) override;
 
-    void deactivate() override
-    {
-      mSnapIndicator->setMatch( QgsPointLocator::Match() );
-
-      QgsMapTool::deactivate();
-    }
+    void deactivate() override;
 
   signals:
     void canvasClicked( const QgsPointXY &point, Qt::MouseButton button );
@@ -66,11 +48,7 @@ class QgsGeorefMapToolEmitPoint : public QgsMapTool
 
   private:
 
-    QgsPointLocator::Match mapPointMatch( QMouseEvent *e )
-    {
-      QgsPointXY pnt = toMapCoordinates( e->pos() );
-      return canvas()->snappingUtils()->snapToMap( pnt );
-    }
+    QgsPointLocator::Match mapPointMatch( QMouseEvent *e );
 
     std::unique_ptr<QgsSnapIndicator> mSnapIndicator;
 };

src/plugins/grass/qgsgrassregion.cpp

@@ -24,11 +24,11 @@
 #include "qgsmapcanvas.h"
 #include "qgsmaptool.h"
 #include "qgsexception.h"
+#include "qgsmapmouseevent.h"
 
 #include <QButtonGroup>
 #include <QColorDialog>
 #include <QMessageBox>
-#include <QMouseEvent>
 #include <QRubberBand>
 #include <QSettings>
 #include <QDoubleValidator>