Qt4 - Fix Advanced preferences images location...

[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 84cb7943fe23cfe4c389f17e5231d50a27113cdd..ce6db230c20e3659b52240608e10d3e1d494dca2 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -60,13 +60,13 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
     setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
 
 #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" );
+    BI( audio, ":/pixmaps/advprefs_audio.png" );
+    BI( video, ":/pixmaps/advprefs_video.png" );
+    BI( input, ":/pixmaps/advprefs_codec.png" );
+    BI( sout, ":/pixmaps/advprefs_sout.png" );
+    BI( advanced, ":/pixmaps/advprefs_extended.png" );
+    BI( playlist, ":/pixmaps/advprefs_playlist.png" );
+    BI( interface, ":/pixmaps/advprefs_intf.png" );
 #undef BI
 
     /* Build the tree for the main module */
@@ -86,9 +86,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
     PrefsItemData *data = NULL;
     QTreeWidgetItem *current_item = NULL;
     unsigned confsize;
-    module_config_t *p_config;
-
-    p_config = module_GetConfig (p_module, &confsize);
+    module_config_t *const p_config = module_GetConfig (p_module, &confsize);
 
     for (size_t i = 0; i < confsize; i++)
     {
@@ -134,6 +132,8 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
             break;
         case CONFIG_SUBCATEGORY:
             if( p_item->value.i == -1 ) break;
+
+            /* Special cases: move the main subcategories to the parent cat*/
             if( data &&
                 ( p_item->value.i == SUBCAT_VIDEO_GENERAL ||
                   p_item->value.i == SUBCAT_ADVANCED_MISC ||
@@ -157,6 +157,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
                                        QVariant::fromValue( data ) );
                 continue;
             }
+
             data = new PrefsItemData();
             data->name = QString( qtr( config_CategoryNameGet(
                                                         p_item->value.i)) );
@@ -193,7 +194,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
 
         unsigned i_subcategory = 0, i_category = 0, confsize;
         bool b_options = false;
-        module_config_t *p_config = module_GetConfig (p_module, &confsize);
+        module_config_t *const p_config = module_GetConfig (p_module, &confsize);
 
         for (size_t i = 0; i < confsize; i++)
         {
@@ -338,15 +339,15 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     if( data->i_type == TYPE_CATEGORY )
         return;
     else if( data->i_type == TYPE_MODULE )
-        p_module = module_FindName( VLC_OBJECT(p_intf), data->psz_name );
+        p_module = module_Find( VLC_OBJECT(p_intf), data->psz_name );
     else
     {
-        p_module = module_FindName( VLC_OBJECT(p_intf), "main" );
+        p_module = module_Find( VLC_OBJECT(p_intf), "main" );
         assert( p_module );
     }
 
     unsigned confsize;
-    module_config_t *p_config = module_GetConfig (p_module, &confsize),
+    module_config_t *const p_config = module_GetConfig (p_module, &confsize),
                     *p_item = p_config,
                     *p_end = p_config + confsize;
 
@@ -363,7 +364,6 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             p_item++;
         }
     }
-    module_PutConfig (p_config);
 
     /* Widgets now */
     global_layout = new QVBoxLayout();