src/video_output/video_output.c: Fixed double free in filter removal

[vlc] / modules / gui / qt4 / components / simple_preferences.hpp

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 7403cbdbf7783e4560b2cac88dd938a61e09c37c..f8f67adb75add356a6741faa57bcb0c0381ab757 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -26,16 +26,17 @@
 
 #include <QListWidget>
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
 
 enum {
-    SPrefsVideo,
+    SPrefsVideo = 0,
     SPrefsAudio,
     SPrefsInputAndCodecs,
     SPrefsPlaylist,
     SPrefsInterface,
     SPrefsSubtitles,
-    SPrefsAdvanced
+    SPrefsAdvanced,
+    SPrefsMax
 };
 #define SPrefsDefaultCat SPrefsInterface
 
@@ -47,12 +48,7 @@ class SPrefsCatList : public QListWidget
 public:
     SPrefsCatList( intf_thread_t *, QWidget *);
     virtual ~SPrefsCatList() {};
-
-    void ApplyAll();
-    void CleanAll();
-
 private:
-    void DoAll( bool );
     intf_thread_t *p_intf;
 };
 
@@ -62,8 +58,8 @@ class SPrefsPanel : public QWidget
 public:
     SPrefsPanel( intf_thread_t *, QWidget *, int );
     virtual ~SPrefsPanel() {};
-    void Apply();
-    void Clean();
+    void apply();
+    void clean();
 private:
     intf_thread_t *p_intf;
     QList<ConfigControl *> controls;