fix typo and missing disconnect

3nids · 3nids · commit a09cb6f36481 · 2018-01-18T10:09:52.000-04:00
diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp
@@ -83,7 +83,7 @@ bool QgsDistanceWidget::eventFilter( QObject *obj, QEvent *ev )
     QKeyEvent *event = static_cast<QKeyEvent *>( ev );
     if ( event->key() == Qt::Key_Escape )
     {
-      emit distanceEditingCancelled();
+      emit distanceEditingCanceled();
       return true;
     }
     if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
@@ -258,7 +258,7 @@ void QgsMapToolSelectRadius::createRotationWidget()
 
   connect( mDistanceWidget, &QgsDistanceWidget::distanceChanged, this, &QgsMapToolSelectRadius::updateRubberband );
   connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingFinished, this, &QgsMapToolSelectRadius::radiusValueEntered );
-  connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCancelled, this, &QgsMapToolSelectRadius::cancel );
+  connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCanceled, this, &QgsMapToolSelectRadius::cancel );
 }
 
 void QgsMapToolSelectRadius::deleteRotationWidget()
@@ -267,6 +267,7 @@ void QgsMapToolSelectRadius::deleteRotationWidget()
   {
     disconnect( mDistanceWidget, &QgsDistanceWidget::distanceChanged, this, &QgsMapToolSelectRadius::updateRubberband );
     disconnect( mDistanceWidget, &QgsDistanceWidget::distanceEditingFinished, this, &QgsMapToolSelectRadius::radiusValueEntered );
+    disconnect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCanceled, this, &QgsMapToolSelectRadius::cancel );
     mDistanceWidget->releaseKeyboard();
     mDistanceWidget->deleteLater();
   }
diff --git a/src/app/qgsmaptoolselectradius.h b/src/app/qgsmaptoolselectradius.h
@@ -44,7 +44,7 @@ class APP_EXPORT QgsDistanceWidget : public QWidget
   signals:
     void distanceChanged( double distance );
     void distanceEditingFinished( double distance, const Qt::KeyboardModifiers &modifiers );
-    void distanceEditingCancelled();
+    void distanceEditingCanceled();
 
   protected:
     bool eventFilter( QObject *obj, QEvent *ev ) override;

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ bool QgsDistanceWidget::eventFilter( QObject obj, QEvent ev )`
`83`	`83`	`QKeyEvent event = static_cast<QKeyEvent >( ev );`
`84`	`84`	`if ( event->key() == Qt::Key_Escape )`
`85`	`85`	`{`
`86`		`- emit distanceEditingCancelled();`
	`86`	`+ emit distanceEditingCanceled();`
`87`	`87`	`return true;`
`88`	`88`	`}`
`89`	`89`	`if ( event->key() == Qt::Key_Enter \|\| event->key() == Qt::Key_Return )`
`@@ -258,7 +258,7 @@ void QgsMapToolSelectRadius::createRotationWidget()`
`258`	`258`
`259`	`259`	`connect( mDistanceWidget, &QgsDistanceWidget::distanceChanged, this, &QgsMapToolSelectRadius::updateRubberband );`
`260`	`260`	`connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingFinished, this, &QgsMapToolSelectRadius::radiusValueEntered );`
`261`		`- connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCancelled, this, &QgsMapToolSelectRadius::cancel );`
	`261`	`+ connect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCanceled, this, &QgsMapToolSelectRadius::cancel );`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`void QgsMapToolSelectRadius::deleteRotationWidget()`
`@@ -267,6 +267,7 @@ void QgsMapToolSelectRadius::deleteRotationWidget()`
`267`	`267`	`{`
`268`	`268`	`disconnect( mDistanceWidget, &QgsDistanceWidget::distanceChanged, this, &QgsMapToolSelectRadius::updateRubberband );`
`269`	`269`	`disconnect( mDistanceWidget, &QgsDistanceWidget::distanceEditingFinished, this, &QgsMapToolSelectRadius::radiusValueEntered );`
	`270`	`+ disconnect( mDistanceWidget, &QgsDistanceWidget::distanceEditingCanceled, this, &QgsMapToolSelectRadius::cancel );`
`270`	`271`	`mDistanceWidget->releaseKeyboard();`
`271`	`272`	`mDistanceWidget->deleteLater();`
`272`	`273`	`}`