Preferences: fix some memleaks and fix horrible video-filter bug. :D

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

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index bcf653a60ee90bba01f05feb60a741ca20ef99b4..29105e863833b57b53def05801f55b10e4c0e9ea 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -24,10 +24,15 @@
 #ifndef _PREFSTREE_H_
 #define _PREFSTREE_H_
 
-#include <QTreeWidget>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
+#include <QTreeWidget>
+
 enum
 {
     TYPE_CATEGORY,
@@ -36,7 +41,7 @@ enum
     TYPE_MODULE
 };
 
-class PrefsPanel;
+class AdvPrefsPanel;
 class QLabel;
 class QVBoxLayout;
 
@@ -46,11 +51,10 @@ public:
     PrefsItemData()
     { panel = NULL; i_object_id = 0; i_subcat_id = -1; psz_name = NULL; };
     virtual ~PrefsItemData() { free( psz_name ); };
-    PrefsPanel *panel;
+    AdvPrefsPanel *panel;
     int i_object_id;
     int i_subcat_id;
     int i_type;
-    bool b_submodule;
     char *psz_name;
     QString name;
     QString help;
@@ -75,13 +79,13 @@ private:
 
 class ConfigControl;
 
-class PrefsPanel : public QWidget
+class AdvPrefsPanel : public QWidget
 {
     Q_OBJECT
 public:
-    PrefsPanel( intf_thread_t *, QWidget *, PrefsItemData * );
-    PrefsPanel( QWidget *);
-    virtual ~PrefsPanel() {};
+    AdvPrefsPanel( intf_thread_t *, QWidget *, PrefsItemData * );
+    AdvPrefsPanel( QWidget *);
+    virtual ~AdvPrefsPanel();
     void apply();
     void clean();
 private: