Qt: make the customize dialog a true Dialog.

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

diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp
index 2d29b6f61dc92b5e10247bd714af3b3e7999dc31..84dbeb3d3abd2aa52c1fdf55775c4a91d09b1978 100644 (file)
--- a/modules/gui/qt4/dialogs/toolbar.hpp
+++ b/modules/gui/qt4/dialogs/toolbar.hpp
@@ -58,26 +58,16 @@ private:
     ToolbarEditDialog *parent;
 };
 
-class ToolbarEditDialog : public QVLCFrame
+class ToolbarEditDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
-    static ToolbarEditDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new ToolbarEditDialog( p_intf );
-        return instance;
-    }
-    static void killInstance()
-    { delete instance; instance = NULL;}
+    ToolbarEditDialog( QWidget *, intf_thread_t * );
     int getOptions() { return flatBox->isChecked() * WIDGET_FLAT +
                         bigBox->isChecked() * WIDGET_BIG +
                         !shinyBox->isChecked() * WIDGET_SHINY; }
-private:
-    ToolbarEditDialog( intf_thread_t * );
     virtual ~ToolbarEditDialog();
-
-    static ToolbarEditDialog *instance;
+private:
 
     QCheckBox *flatBox, *bigBox, *shinyBox;
     QComboBox *positionCombo, *profileCombo;