Make QgsOptionsDialogBase's slots virtual for overriding in derived c…

…lases with non-standard tabs (fixes broken tab behaviour in Plugin manager)
qgis · Nov 6, 2017 · 966e2d6 · 966e2d6
1 parent 17aa88c
commit 966e2d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/python/gui/qgsoptionsdialogbase.sip b/python/gui/qgsoptionsdialogbase.sip
@@ -127,9 +127,10 @@ class QgsOptionsDialogBase : QDialog
 %End
 
   protected slots:
-    void updateOptionsListVerticalTabs();
+    virtual void updateOptionsListVerticalTabs();
-    void optionsStackedWidget_CurrentChanged( int indx );
+    virtual void optionsStackedWidget_CurrentChanged( int indx );
-    void optionsStackedWidget_WidgetRemoved( int indx );
+    virtual void optionsStackedWidget_WidgetRemoved( int indx );
+
     void warnAboutMissingObjects();
 
   protected:

diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h
@@ -172,7 +172,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
     void showHelp();
 
     //! Reimplement QgsOptionsDialogBase method to prevent modifying the tab list by signals from the stacked widget
-    void optionsStackedWidget_CurrentChanged( int indx ) { Q_UNUSED( indx ) }
+    void optionsStackedWidget_CurrentChanged( int indx ) override { Q_UNUSED( indx ) };
 
     //! Only show plugins from selected repository (e.g. for inspection)
     void setRepositoryFilter();

diff --git a/src/gui/qgsoptionsdialogbase.h b/src/gui/qgsoptionsdialogbase.h
@@ -158,9 +158,10 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog
     void searchText( const QString &text );
 
   protected slots:
-    void updateOptionsListVerticalTabs();
+    virtual void updateOptionsListVerticalTabs();
-    void optionsStackedWidget_CurrentChanged( int indx );
+    virtual void optionsStackedWidget_CurrentChanged( int indx );
-    void optionsStackedWidget_WidgetRemoved( int indx );
+    virtual void optionsStackedWidget_WidgetRemoved( int indx );
+
     void warnAboutMissingObjects();
 
   protected: