Misc cleanups in Qt4. (Closes:#736)

[vlc] / modules / gui / qt4 / dialogs_provider.hpp

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index b7c90c279da443775104ca5533f35f8794118c85..ef00415445dc859509a55b918db4dde28becaec2 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -26,10 +26,12 @@
 #include <QObject>
 #include <QTimer>
 #include <QApplication>
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+
 #include "dialogs/interaction.hpp"
+
 #include <assert.h>
+#include <vlc/vlc.h>
+#include <vlc_interface.h>
 
 class QEvent;
 class QSignalMapper;
@@ -39,7 +41,7 @@ class DialogsProvider : public QObject
 {
     Q_OBJECT;
 public:
-    static DialogsProvider *getInstance() 
+    static DialogsProvider *getInstance()
     {
         assert( instance );
         return instance;
@@ -50,33 +52,54 @@ public:
             instance = new DialogsProvider( p_intf );
         return instance;
     }
+    static void killInstance()
+    {
+        if( instance ) delete instance;
+        instance=NULL;
+    }
     virtual ~DialogsProvider();
-    QTimer *idle_timer;
     QTimer *fixed_timer;
 protected:
     friend class QVLCMenu;
     QSignalMapper *menusMapper;
     QSignalMapper *menusUpdateMapper;
+    QSignalMapper *SDMapper;
     void customEvent( QEvent *);
 private:
     DialogsProvider( intf_thread_t *);
     intf_thread_t *p_intf;
     static DialogsProvider *instance;
+    QStringList showSimpleOpen();
+    void addFromSimple( bool, bool );
 
 public slots:
     void playlistDialog();
-    void streaminfoDialog();
+    void bookmarksDialog();
+    void mediaInfoDialog();
     void prefsDialog();
+    void extendedDialog();
     void messagesDialog();
+    void simplePLAppendDialog();
+    void simpleMLAppendDialog();
     void simpleOpenDialog();
     void openDialog();
+    void PLAppendDialog();
+    void MLAppendDialog();
     void openDialog( int );
     void popupMenu( int );
     void doInteraction( intf_dialog_args_t * );
     void menuAction( QObject *);
     void menuUpdateAction( QObject *);
+    void SDMenuAction( QString );
     void streamingDialog();
+    void openPlaylist();
+    void savePlaylist();
+    void PLAppendDir();
+    void MLAppendDir();
+    void quit();
+    void switchToSkins();
+    void helpDialog();
+    void aboutDialog();
 };
 
-
 #endif