Merge branch 'master' into lpcm_encoder

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

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index e6c66b3bba841e0a5ad7279270d7cdfb1d538539..279f83bdcdebd0db7282ec79f0eaa86c40a7e204 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -87,7 +87,7 @@ class QVLCMenu;
 
 class DialogsProvider : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
     friend class QVLCMenu;
 
 public:
@@ -130,6 +130,7 @@ private:
     static DialogsProvider *instance;
 
     intf_thread_t *p_intf;
+    QWidget* root;
     bool b_isDying;
 
     void openDialog( int );
@@ -158,6 +159,7 @@ public slots:
     void podcastConfigureDialog();
     void toolbarDialog();
     void pluginDialog();
+    void epgDialog();
 
     void openFileGenericDialog( intf_dialog_args_t * );
 
@@ -207,8 +209,8 @@ public:
         i_dialog = _i_dialog;
         i_arg = _i_arg;
         p_arg = _p_arg;
-    };
-    virtual ~DialogEvent() { };
+    }
+    virtual ~DialogEvent() { }
 
     int i_arg, i_dialog;
     intf_dialog_args_t *p_arg;