Followup canvas focus commit

qgis · Aug 21, 2017 · a2c9710 · a2c9710
1 parent a6b0c44
commit a2c9710
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1234,7 +1234,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   }
 #endif
 
-  connect( qApp, SIGNAL( focusChanged( QWidget*, QWidget* ) ), this, SLOT( onFocusChanged( QWidget*, QWidget* ) ) );
+  connect( qApp, &QApplication::focusChanged, this, &QgisApp::onFocusChanged );
 } // QgisApp ctor
 
 QgisApp::QgisApp()
@@ -8792,10 +8792,11 @@ void QgisApp::userRotation()
   mMapCanvas->refresh();
 }
 
-void QgisApp::onFocusChanged( QWidget* /*old*/, QWidget* now )
+void QgisApp::onFocusChanged( QWidget *oldWidget, QWidget *newWidget )
 {
-  // If nothing has focus even though the window is active, ensure map canvas receives it
-  if ( !now && isActiveWindow() )
+  Q_UNUSED( oldWidget );
+  // If nothing has focus even though this window is active, ensure map canvas receives it
+  if ( !newWidget && isActiveWindow() )
   {
     mapCanvas()->setFocus();
   }

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1510,7 +1510,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     void updateCrsStatusBar();
 
-    void onFocusChanged( QWidget* old, QWidget* now );
+    void onFocusChanged( QWidget *oldWidget, QWidget *newWidget );
 
   signals: