A bit of headers cleanup

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 6018313f9c55d3cb626ddce0c532a8a5682d8548..2aef00bec0fe000f1f5840bbee4300503928750f 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;
@@ -50,13 +52,18 @@ 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 *);
@@ -67,8 +74,9 @@ private:
 public slots:
     void playlistDialog();
     void bookmarksDialog();
-    void streaminfoDialog();
+    void MediaInfoDialog();
     void prefsDialog();
+    void extendedDialog();
     void messagesDialog();
     void simplePLAppendDialog();
     void simpleMLAppendDialog();
@@ -81,12 +89,13 @@ public slots:
     void doInteraction( intf_dialog_args_t * );
     void menuAction( QObject *);
     void menuUpdateAction( QObject *);
+    void SDMenuAction( QString );
     void streamingDialog();
     void openPlaylist();
     void openDirectory();
     void openMLDirectory();
     void quit();
+    void switchToSkins();
 };
 
-
 #endif