sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix typo and missing disconnect

Browse Source
This commit is contained in:
Denis Rouzaud 2018-01-18 10:09:25 -04:00
parent 4733bc8210
commit a09cb6f364
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/qgsmaptoolselectradius.cpp
View File

@ -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();
}

2
src/app/qgsmaptoolselectradius.h
View File

@ -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;