[vlc-commits] Qt: prefsItemData: rename ambigous var

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec 26 23:34:22 2012 +0100| [b1d935415926a30bd5aa50ab24dfb2d903f8bdc4] | committer: Francois Cartegnie

Qt: prefsItemData: rename ambigous var

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1d935415926a30bd5aa50ab24dfb2d903f8bdc4
---

 modules/gui/qt4/components/complete_preferences.cpp |   10 +++++-----
 modules/gui/qt4/components/complete_preferences.hpp |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 06cd89b..5048a0f 100644
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -270,7 +270,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
 
         PrefsItemData *module_data = new PrefsItemData();
         module_data->i_type = PrefsItemData::TYPE_MODULE;
-        module_data->psz_name = strdup( module_get_object( p_module ) );
+        module_data->psz_shortcut = strdup( module_get_object( p_module ) );
         module_data->name = qtr( module_get_name( p_module, false ) );
         module_data->help.clear();
         const char *psz_help = module_get_help( p_module );
@@ -436,7 +436,7 @@ void PrefsTree::updateLoadedStatus( QTreeWidgetItem *item = NULL,
     {
         PrefsItemData *data = item->data( 0, Qt::UserRole )
                 .value<PrefsItemData *>();
-        data->b_loaded = loaded->contains( QString( data->psz_name ) );
+        data->b_loaded = loaded->contains( QString( data->psz_shortcut ) );
 
         for( int i = 0; i < item->childCount(); i++ )
             updateLoadedStatus( item->child( i ), loaded );
@@ -483,7 +483,7 @@ PrefsItemData::PrefsItemData()
     panel = NULL;
     i_object_id = 0;
     i_subcat_id = -1;
-    psz_name = NULL;
+    psz_shortcut = NULL;
     b_loaded = false;
 }
 
@@ -496,7 +496,7 @@ bool PrefsItemData::contains( const QString &text, Qt::CaseSensitivity cs )
     if( this->i_type == TYPE_CATEGORY )
         return false;
     else if( this->i_type == TYPE_MODULE )
-        p_module = module_find( this->psz_name );
+        p_module = module_find( this->psz_shortcut );
     else
     {
         p_module = module_get_main();
@@ -584,7 +584,7 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     if( data->i_type == PrefsItemData::TYPE_CATEGORY )
         return;
     else if( data->i_type == PrefsItemData::TYPE_MODULE )
-        p_module = module_find( data->psz_name );
+        p_module = module_find( data->psz_shortcut );
     else
     {
         p_module = module_get_main();
diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index df39749..3e6658c 100644
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -43,7 +43,7 @@ class PrefsItemData : public QObject
     Q_OBJECT
 public:
     PrefsItemData();
-    virtual ~PrefsItemData() { free( psz_name ); };
+    virtual ~PrefsItemData() { free( psz_shortcut ); };
     bool contains( const QString &text, Qt::CaseSensitivity cs );
     AdvPrefsPanel *panel;
     int i_object_id;
@@ -56,7 +56,7 @@ public:
         TYPE_MODULE
     };
     prefsType i_type;
-    char *psz_name;
+    char *psz_shortcut;
     bool b_loaded;
     QString name;
     QString help;