Qt: remove Preferences singleton. Simplify and Close #2552 and #2551

[vlc] / modules / gui / qt4 / dialogs / preferences.hpp

diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp
index bcd1f49ef4c1b6d5291519d45a4bb6b71bee39b4..ef50b5201b63447983cb37bef35222a73de2bcda 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -45,24 +45,16 @@ class PrefsDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
-    static PrefsDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance )
-            instance = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
-        return instance;
-    }
-    virtual ~PrefsDialog() { instance = NULL; }
+    PrefsDialog( QWidget *, intf_thread_t * );
+    virtual ~PrefsDialog() {}
 #if 0
     /*Called from extended settings, is not used anymore, but could be useful one day*/
     void showModulePrefs( char* );
 #endif
 
 private:
-    PrefsDialog( QWidget *, intf_thread_t * );
     QGridLayout *main_layout;
 
-    void destroyPanels();
-
     QWidget *main_panel;
     QHBoxLayout *main_panel_l;
 
@@ -79,8 +71,6 @@ private:
     QGroupBox *types;
     QRadioButton *small,*all;
 
-    static PrefsDialog *instance;
-
     bool b_small;
 
 private slots: