fix typo and missing disconnect

qgis · Jan 18, 2018 · a09cb6f · a09cb6f
1 parent 4733bc8
commit a09cb6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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;