Drop trailing semicolons

[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 63309a0f4855ebafee00412b07fff7ab4c724a2b..626de8279bd38084013990262409ecb0f38166a8 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -2,7 +2,7 @@
  * simple_preferences.hpp : Simple prefs
  ****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: preferences.hpp 16348 2006-08-25 21:10:10Z zorglub $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -28,9 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
-#include <QWidget>
 
 #include "ui/sprefs_input.h"
 #include "ui/sprefs_audio.h"
@@ -38,6 +37,12 @@
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_interface.h"
 
+#ifdef WIN32
+# include "util/registry.hpp"
+#endif
+
+#include <QWidget>
+
 enum {
     SPrefsInterface = 0,
     SPrefsAudio,
@@ -52,15 +57,28 @@ enum {
 enum {
     CachingCustom = 0,
     CachingLowest = 100,
-    CachingLow = 200,
+    CachingLow    = 200,
     CachingNormal = 300,
-    CachingHigh = 400,
-    CachingHigher = 500
+    CachingHigh   = 750,
+    CachingHigher = 2500
 };
 
-enum { alsaW = 0, ossW, directxW, fileW, audioOutCoB, normalizerChB };
-enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
-enum { skinRB, qtRB };
+enum {
+#ifdef WIN32
+       directxW,
+#else
+       alsaW,
+       ossW,
+#endif
+       fileW,
+       audioOutCoB,
+       normalizerChB,
+       volLW,
+       headphoneB,
+       spdifChB,
+};
+enum { inputLE, cachingCoB };
+enum { skinRB, qtRB, styleCB };
 
 class ConfigControl;
 class QComboBox;
@@ -68,15 +86,16 @@ class QLineEdit;
 class QRadioButton;
 class QCheckBox;
 class QString;
-#if WIN32
-class QListWidgetItem;
+
+#ifdef WIN32
+class QTreeWidgetItem;
 #endif
 
 class SPrefsCatList : public QWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
-    SPrefsCatList( intf_thread_t *, QWidget *);
+    SPrefsCatList( intf_thread_t *, QWidget *, bool );
     virtual ~SPrefsCatList() {};
 private:
     intf_thread_t *p_intf;
@@ -90,8 +109,8 @@ class SPrefsPanel : public QWidget
 {
     Q_OBJECT
 public:
-    SPrefsPanel( intf_thread_t *, QWidget *, int );
-    virtual ~SPrefsPanel() {};
+    SPrefsPanel( intf_thread_t *, QWidget *, int, bool );
+    virtual ~SPrefsPanel();
     void apply();
     void clean();
 private:
@@ -101,20 +120,23 @@ private:
     int number;
 
     QList<QWidget *> optionWidgets;
-    QString qs_filter;
+    QStringList qs_filter;
 
-#if WIN32
-    QList<QListWidgetItem *> listAsso;
+#ifdef WIN32
+    QList<QTreeWidgetItem *> listAsso;
+    bool addType( const char * psz_ext, QTreeWidgetItem*, QTreeWidgetItem*, QVLCRegistry* );
 #endif
 
 /* Display only the options for the selected audio output */
 private slots:
     void lastfm_Changed( int );
     void updateAudioOptions( int );
-#ifdef WIN32
+    void updateAudioVolume( int );
+#ifdef SYS_MINGW32
     void assoDialog();
     void saveAsso();
 #endif
+    void changeStyle( QString );
 };
 
 #endif