Qt4 : Various changes especially about StreamInfo => MediaInfo

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 1da6baef43a3cebfa260a9650ff2ddce2b7741bf..912251ecb1b4021fff1491244429d78261cf5387 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -52,13 +52,18 @@ public:
             instance = new DialogsProvider( p_intf );
         return instance;
     }
-    static void killInstance() { if( instance ) delete instance; }
+    static void killInstance()
+    {
+        if( instance ) delete instance;
+        instance=NULL;
+    }
     virtual ~DialogsProvider();
     QTimer *fixed_timer;
 protected:
     friend class QVLCMenu;
     QSignalMapper *menusMapper;
     QSignalMapper *menusUpdateMapper;
+    QSignalMapper *SDMapper;
     void customEvent( QEvent *);
 private:
     DialogsProvider( intf_thread_t *);
@@ -69,7 +74,7 @@ private:
 public slots:
     void playlistDialog();
     void bookmarksDialog();
-    void streaminfoDialog();
+    void MediaInfoDialog();
     void prefsDialog();
     void extendedDialog();
     void messagesDialog();
@@ -84,11 +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