X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fcomplete_preferences.hpp;h=32ad1896b8e0c5ed91449ef802a0c51ff4ad3a3c;hb=9f5e603eb353c7fca31aa2919b2d13b177ce7760;hp=1c53e2e8b97eca5d93e31e61c0b13a7907cccec3;hpb=925ab46a94adc6829afd7990a58bb11ed19cf232;p=vlc

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index 1c53e2e8b9..32ad1896b8 100644
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * preferences_tree.hpp : Tree of modules for preferences
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -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;
@@ -60,7 +64,7 @@ Q_DECLARE_METATYPE( PrefsItemData* );
 
 class PrefsTree : public QTreeWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
     PrefsTree( intf_thread_t *, QWidget * );
     virtual ~PrefsTree();
@@ -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: