remove setParentTool method in QgsMapToolAddCircularString

lbartoletti · lbartoletti · commit 5a9278b51e4a · 2017-10-09T23:43:51.000+02:00
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
@@ -29,10 +29,10 @@ QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *par
   , mParentTool( parentTool )
   , mShowCenterPointRubberBand( false )
 {
-  if ( mCanvas )
-  {
-    connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );
-  }
+  /* if ( mCanvas )
+   {
+     connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );
+   }*/
   connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );
   connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );
 }
@@ -43,7 +43,7 @@ QgsMapToolAddCircularString::~QgsMapToolAddCircularString()
   delete mTempRubberBand;
   removeCenterPointRubberBand();
 }
-
+/*
 void QgsMapToolAddCircularString::setParentTool( QgsMapTool *newTool, QgsMapTool *oldTool )
 {
   QgsMapToolCapture *tool = dynamic_cast<QgsMapToolCapture *>( oldTool );
@@ -56,7 +56,7 @@ void QgsMapToolAddCircularString::setParentTool( QgsMapTool *newTool, QgsMapTool
   {
     mParentTool = tool;
   }
-}
+}*/
 
 void QgsMapToolAddCircularString::keyPressEvent( QKeyEvent *e )
 {
diff --git a/src/app/qgsmaptooladdcircularstring.h b/src/app/qgsmaptooladdcircularstring.h
@@ -34,8 +34,8 @@ class QgsMapToolAddCircularString: public QgsMapToolCapture
 
     void activate() override;
 
-  private slots:
-    void setParentTool( QgsMapTool *newTool, QgsMapTool *oldTool );
+    /*private slots:
+      void setParentTool( QgsMapTool *newTool, QgsMapTool *oldTool );*/
 
   protected:
 

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *par`
`29`	`29`	`, mParentTool( parentTool )`
`30`	`30`	`, mShowCenterPointRubberBand( false )`
`31`	`31`	`{`
`32`		`- if ( mCanvas )`
`33`		`- {`
`34`		`- connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );`
`35`		`- }`
	`32`	`+ /* if ( mCanvas )`
	`33`	`+ {`
	`34`	`+ connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );`
	`35`	`+ }*/`
`36`	`36`	`connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );`
`37`	`37`	`connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );`
`38`	`38`	`}`
`@@ -43,7 +43,7 @@ QgsMapToolAddCircularString::~QgsMapToolAddCircularString()`
`43`	`43`	`delete mTempRubberBand;`
`44`	`44`	`removeCenterPointRubberBand();`
`45`	`45`	`}`
`46`		`-`
	`46`	`+/*`
`47`	`47`	`void QgsMapToolAddCircularString::setParentTool( QgsMapTool newTool, QgsMapTool oldTool )`
`48`	`48`	`{`
`49`	`49`	`QgsMapToolCapture tool = dynamic_cast<QgsMapToolCapture >( oldTool );`
`@@ -56,7 +56,7 @@ void QgsMapToolAddCircularString::setParentTool( QgsMapTool *newTool, QgsMapTool`
`56`	`56`	`{`
`57`	`57`	`mParentTool = tool;`
`58`	`58`	`}`
`59`		`-}`
	`59`	`+}*/`
`60`	`60`
`61`	`61`	`void QgsMapToolAddCircularString::keyPressEvent( QKeyEvent *e )`
`62`	`62`	`{`