qt4: Don't create QMenu without parents

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

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index da5e29acc09375210e4b8b08ef76f991933cf523..ed16ded6e087b9e3c5504582aca17efc6be4e509 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -27,37 +27,28 @@
 #include "util/qvlcframe.hpp"
 
 #include "components/extended_panels.hpp"
+#include "util/singleton.hpp"
 
 class QTabWidget;
 
-class ExtendedDialog : public QVLCFrame
+class ExtendedDialog : public QVLCFrame, public Singleton<ExtendedDialog>
 {
     Q_OBJECT;
 public:
-    static ExtendedDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new ExtendedDialog( p_intf );
-        return instance;
-    }
-    static void killInstance()
-    {
-        delete instance;
-        instance = NULL;
-    }
     void showTab( int i );
+    int currentTab();
 private:
     ExtendedDialog( intf_thread_t * );
     virtual ~ExtendedDialog();
 
-    static ExtendedDialog *instance;
-
     SyncControls *syncW;
     ExtVideo *videoEffect;
     Equalizer *equal;
     QTabWidget *mainTabW;
 private slots:
     void changedItem( int );
+
+    friend class    Singleton<ExtendedDialog>;
 };
 
 #endif