Add bool argument to avoid sender check in slot.

qgis · Jun 7, 2019 · f22e4ec · f22e4ec
1 parent e299301
commit f22e4ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/app/3d/qgs3dmapcanvasdockwidget.cpp b/src/app/3d/qgs3dmapcanvasdockwidget.cpp
@@ -57,12 +57,13 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
 
   QAction *toggleOnScreenNavigation = toolBar->addAction(
                                         QgsApplication::getThemeIcon( QStringLiteral( "mAction3DNavigation.svg" ) ),
-                                        tr( "Toggle On-Screen Navigation" ), this, &Qgs3DMapCanvasDockWidget::toggleNavigationWidget );
+                                        tr( "Toggle On-Screen Navigation" ));
 
   toggleOnScreenNavigation->setCheckable( true );
   toggleOnScreenNavigation->setChecked(
     setting.value( QStringLiteral( "/3D/navigationWidget/visibility" ), true, QgsSettings::Gui ).toBool()
   );
+  QObject::connect(toggleOnScreenNavigation, &QAction::toggled, this, &Qgs3DMapCanvasDockWidget::toggleNavigationWidget);
 
   toolBar->addSeparator();
 
@@ -158,13 +159,9 @@ void Qgs3DMapCanvasDockWidget::identify()
   mCanvas->setMapTool( action->isChecked() ? mMapToolIdentify : nullptr );
 }
 
-void Qgs3DMapCanvasDockWidget::toggleNavigationWidget()
+void Qgs3DMapCanvasDockWidget::toggleNavigationWidget(bool visibility)
 {
-  QAction *action = qobject_cast<QAction *>( sender() );
-  if ( !action )
-    return;
-
-  mCanvas->setOnScreenNavigationVisibility( action->isChecked() );
+  mCanvas->setOnScreenNavigationVisibility( visibility );
 }
 
 void Qgs3DMapCanvasDockWidget::setMapSettings( Qgs3DMapSettings *map )

diff --git a/src/app/3d/qgs3dmapcanvasdockwidget.h b/src/app/3d/qgs3dmapcanvasdockwidget.h
@@ -48,7 +48,7 @@ class Qgs3DMapCanvasDockWidget : public QgsDockWidget
     void saveAsImage();
     void toggleAnimations();
     void identify();
-    void toggleNavigationWidget();
+    void toggleNavigationWidget(bool visibility);
 
     void onMainCanvasLayersChanged();
     void onMainCanvasColorChanged();