Qt4 - Prefs; cleaning, disabling unused code, general comments, class renaming, in...

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

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index dbba8dd4d0ea4131e5664dcff9602a5e4ab003a1..c2d7d47319f21b6206366c63230c3fc7f17028f0 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -39,20 +39,11 @@
 
 #include "components/complete_preferences.hpp"
 #include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
 
 #include <vlc_config_cat.h>
 #include <vlc_intf_strings.h>
 #include <assert.h>
 
-#include "pixmaps/audio.xpm"
-#include "pixmaps/video.xpm"
-#include "pixmaps/type_net.xpm"
-#include "pixmaps/type_playlist.xpm"
-#include "pixmaps/advanced.xpm"
-#include "pixmaps/codec.xpm"
-#include "pixmaps/intf.xpm"
-
 #define ITEM_HEIGHT 25
 
 /*********************************************************************
@@ -68,14 +59,14 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
     setTextElideMode( Qt::ElideNone );
     setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
 
-#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b##_xpm ))
-    BI( audio, audio );
-    BI( video, video );
-    BI( input, codec );
-    BI( sout, type_net );
-    BI( advanced, advanced );
-    BI( playlist, type_playlist );
-    BI( interface, intf );
+#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
+    BI( audio, ":/pixmaps/vlc_advprefs_audio.png" );
+    BI( video, ":/pixmaps/vlc_advprefs_video.png" );
+    BI( input, ":/pixmaps/vlc_advprefs_codec.png" );
+    BI( sout, ":/pixmaps/vlc_advprefs_sout.png" );
+    BI( advanced, ":/pixmaps/vlc_advprefs_extended.png" );
+    BI( playlist, ":/pixmaps/vlc_advprefs_playlist.png" );
+    BI( interface, ":/pixmaps/vlc_advprefs_intf.png" );
 #undef BI
 
     /* Build the tree for the main module */
@@ -333,10 +324,10 @@ void PrefsTree::doAll( bool doclean )
 /*********************************************************************
  * The Panel
  *********************************************************************/
-PrefsPanel::PrefsPanel( QWidget *_parent ) : QWidget( _parent )
+AdvPrefsPanel::AdvPrefsPanel( QWidget *_parent ) : QWidget( _parent )
 {}
 
-PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
+AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                         PrefsItemData * data ) :
                         QWidget( _parent ), p_intf( _p_intf )
 {
@@ -499,7 +490,7 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     setLayout( global_layout );
 }
 
-void PrefsPanel::apply()
+void AdvPrefsPanel::apply()
 {
     QList<ConfigControl *>::Iterator i;
     for( i = controls.begin() ; i != controls.end() ; i++ )
@@ -508,5 +499,5 @@ void PrefsPanel::apply()
         c->doApply( p_intf );
     }
 }
-void PrefsPanel::clean()
+void AdvPrefsPanel::clean()
 {}