Skip to content

Commit e208bc0

Browse files
committed
Change QgsMapTool *mAddFeature to QgsMapToolAddFeature *mAddFeature and
remove dynamic_cast
1 parent 775ac7b commit e208bc0

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

src/app/qgisapp.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3209,39 +3209,39 @@ void QgisApp::createCanvasTools()
32093209
mMapTools.mAnnotation->setAction( mActionAnnotation );
32103210
mMapTools.mAddFeature = new QgsMapToolAddFeature( mMapCanvas, QgsMapToolCapture::CaptureNone );
32113211
mMapTools.mAddFeature->setAction( mActionAddFeature );
3212-
mMapTools.mCircularStringCurvePoint = new QgsMapToolCircularStringCurvePoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3212+
mMapTools.mCircularStringCurvePoint = new QgsMapToolCircularStringCurvePoint( mMapTools.mAddFeature, mMapCanvas );
32133213
mMapTools.mCircularStringCurvePoint->setAction( mActionCircularStringCurvePoint );
3214-
mMapTools.mCircularStringRadius = new QgsMapToolCircularStringRadius( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3214+
mMapTools.mCircularStringRadius = new QgsMapToolCircularStringRadius( mMapTools.mAddFeature, mMapCanvas );
32153215
mMapTools.mCircularStringRadius->setAction( mActionCircularStringRadius );
3216-
mMapTools.mCircle2Points = new QgsMapToolCircle2Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3216+
mMapTools.mCircle2Points = new QgsMapToolCircle2Points( mMapTools.mAddFeature, mMapCanvas );
32173217
mMapTools.mCircle2Points->setAction( mActionCircle2Points );
3218-
mMapTools.mCircle3Points = new QgsMapToolCircle3Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3218+
mMapTools.mCircle3Points = new QgsMapToolCircle3Points( mMapTools.mAddFeature, mMapCanvas );
32193219
mMapTools.mCircle3Points->setAction( mActionCircle3Points );
3220-
mMapTools.mCircle3Tangents = new QgsMapToolCircle3Tangents( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3220+
mMapTools.mCircle3Tangents = new QgsMapToolCircle3Tangents( mMapTools.mAddFeature, mMapCanvas );
32213221
mMapTools.mCircle3Tangents->setAction( mActionCircle3Tangents );
3222-
mMapTools.mCircle2TangentsPoint = new QgsMapToolCircle2TangentsPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3222+
mMapTools.mCircle2TangentsPoint = new QgsMapToolCircle2TangentsPoint( mMapTools.mAddFeature, mMapCanvas );
32233223
mMapTools.mCircle2TangentsPoint->setAction( mActionCircle2TangentsPoint );
3224-
mMapTools.mCircleCenterPoint = new QgsMapToolCircleCenterPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3224+
mMapTools.mCircleCenterPoint = new QgsMapToolCircleCenterPoint( mMapTools.mAddFeature, mMapCanvas );
32253225
mMapTools.mCircleCenterPoint->setAction( mActionCircleCenterPoint );
3226-
mMapTools.mEllipseCenter2Points = new QgsMapToolEllipseCenter2Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3226+
mMapTools.mEllipseCenter2Points = new QgsMapToolEllipseCenter2Points( mMapTools.mAddFeature, mMapCanvas );
32273227
mMapTools.mEllipseCenter2Points->setAction( mActionEllipseCenter2Points );
3228-
mMapTools.mEllipseCenterPoint = new QgsMapToolEllipseCenterPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3228+
mMapTools.mEllipseCenterPoint = new QgsMapToolEllipseCenterPoint( mMapTools.mAddFeature, mMapCanvas );
32293229
mMapTools.mEllipseCenterPoint->setAction( mActionEllipseCenterPoint );
3230-
mMapTools.mEllipseExtent = new QgsMapToolEllipseExtent( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3230+
mMapTools.mEllipseExtent = new QgsMapToolEllipseExtent( mMapTools.mAddFeature, mMapCanvas );
32313231
mMapTools.mEllipseExtent->setAction( mActionEllipseExtent );
3232-
mMapTools.mEllipseFoci = new QgsMapToolEllipseFoci( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3232+
mMapTools.mEllipseFoci = new QgsMapToolEllipseFoci( mMapTools.mAddFeature, mMapCanvas );
32333233
mMapTools.mEllipseFoci->setAction( mActionEllipseFoci );
3234-
mMapTools.mRectangleCenterPoint = new QgsMapToolRectangleCenter( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3234+
mMapTools.mRectangleCenterPoint = new QgsMapToolRectangleCenter( mMapTools.mAddFeature, mMapCanvas );
32353235
mMapTools.mRectangleCenterPoint->setAction( mActionRectangleCenterPoint );
3236-
mMapTools.mRectangleExtent = new QgsMapToolRectangleExtent( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3236+
mMapTools.mRectangleExtent = new QgsMapToolRectangleExtent( mMapTools.mAddFeature, mMapCanvas );
32373237
mMapTools.mRectangleExtent->setAction( mActionRectangleExtent );
3238-
mMapTools.mRectangle3Points = new QgsMapToolRectangle3Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3238+
mMapTools.mRectangle3Points = new QgsMapToolRectangle3Points( mMapTools.mAddFeature, mMapCanvas );
32393239
mMapTools.mRectangle3Points->setAction( mActionRectangle3Points );
3240-
mMapTools.mRegularPolygon2Points = new QgsMapToolRegularPolygon2Points( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3240+
mMapTools.mRegularPolygon2Points = new QgsMapToolRegularPolygon2Points( mMapTools.mAddFeature, mMapCanvas );
32413241
mMapTools.mRegularPolygon2Points->setAction( mActionRegularPolygon2Points );
3242-
mMapTools.mRegularPolygonCenterPoint = new QgsMapToolRegularPolygonCenterPoint( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3242+
mMapTools.mRegularPolygonCenterPoint = new QgsMapToolRegularPolygonCenterPoint( mMapTools.mAddFeature, mMapCanvas );
32433243
mMapTools.mRegularPolygonCenterPoint->setAction( mActionRegularPolygonCenterPoint );
3244-
mMapTools.mRegularPolygonCenterCorner = new QgsMapToolRegularPolygonCenterCorner( dynamic_cast<QgsMapToolAddFeature *>( mMapTools.mAddFeature ), mMapCanvas );
3244+
mMapTools.mRegularPolygonCenterCorner = new QgsMapToolRegularPolygonCenterCorner( mMapTools.mAddFeature, mMapCanvas );
32453245
mMapTools.mRegularPolygonCenterCorner->setAction( mActionRegularPolygonCenterCorner );
32463246
mMapTools.mMoveFeature = new QgsMapToolMoveFeature( mMapCanvas, QgsMapToolMoveFeature::Move );
32473247
mMapTools.mMoveFeature->setAction( mActionMoveFeature );

src/app/qgisapp.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class QgsMapLayerConfigWidgetFactory;
7171
class QgsMapOverviewCanvas;
7272
class QgsMapTip;
7373
class QgsMapTool;
74+
class QgsMapToolAddFeature;
7475
class QgsMapToolAdvancedDigitizing;
7576
class QgsMapToolIdentifyAction;
7677
class QgsPluginLayer;
@@ -1791,7 +1792,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
17911792
QgsMapTool *mMeasureDist = nullptr;
17921793
QgsMapTool *mMeasureArea = nullptr;
17931794
QgsMapTool *mMeasureAngle = nullptr;
1794-
QgsMapTool *mAddFeature = nullptr;
1795+
QgsMapToolAddFeature *mAddFeature = nullptr;
17951796
QgsMapTool *mCircularStringCurvePoint = nullptr;
17961797
QgsMapTool *mCircularStringRadius = nullptr;
17971798
QgsMapTool *mCircle2Points = nullptr;

0 commit comments

Comments
 (0)