Fix memleaks: Fill in the destructor of simple preference.

[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..afff9f4bee3ef54269f181c6b6ce21b1573227d5 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,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <QWidget>
 
@@ -37,6 +37,9 @@
 #include "ui/sprefs_video.h"
 #include "ui/sprefs_subtitles.h"
 #include "ui/sprefs_interface.h"
+#ifdef WIN32
+#include "util/registry.hpp"
+#endif
 
 enum {
     SPrefsInterface = 0,
@@ -58,7 +61,17 @@ enum {
     CachingHigher = 500
 };
 
-enum { alsaW = 0, ossW, directxW, fileW, audioOutCoB, normalizerChB };
+enum {
+#ifdef WIN32
+       directxW,
+#else
+       alsaW,
+       ossW,
+#endif
+       fileW,
+       audioOutCoB,
+       normalizerChB,
+       volLW };
 enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
 enum { skinRB, qtRB };
 
@@ -68,8 +81,9 @@ class QLineEdit;
 class QRadioButton;
 class QCheckBox;
 class QString;
-#if WIN32
-class QListWidgetItem;
+
+#ifdef WIN32
+class QTreeWidgetItem;
 #endif
 
 class SPrefsCatList : public QWidget
@@ -91,7 +105,7 @@ class SPrefsPanel : public QWidget
     Q_OBJECT
 public:
     SPrefsPanel( intf_thread_t *, QWidget *, int );
-    virtual ~SPrefsPanel() {};
+    virtual ~SPrefsPanel();
     void apply();
     void clean();
 private:
@@ -103,15 +117,17 @@ private:
     QList<QWidget *> optionWidgets;
     QString 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