vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Feb 1 17:25:31 2012 +0100| [024c0a8f25d5fac9580b5ad0fe8980779d700dd4] | committer: Jean-Baptiste Kempf
Qt4: preferences, move a Macro to a normal function (cherry picked from commit a728a7ede2500febe9003c9b1cc6170f167cb821) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=024c0a8f25d5fac9580b5ad0fe8980779d700dd4 --- modules/gui/qt4/components/preferences_widgets.cpp | 35 +++++++++---------- modules/gui/qt4/components/preferences_widgets.hpp | 1 + 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index bc8cb61..20ffa05 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -723,22 +723,22 @@ ModuleListConfigControl::~ModuleListConfigControl() delete groupBox; } -#define CHECKBOX_LISTS \ -{ \ - QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\ - checkBoxListItem *cbl = new checkBoxListItem; \ -\ - CONNECT( cb, stateChanged( int ), this, onUpdate() );\ - const char *help = module_get_help( p_parser ); \ - if( help != NULL ) \ - cb->setToolTip( formatTooltip( qtr( help ) ) ); \ - cbl->checkBox = cb; \ -\ - cbl->psz_module = strdup( module_get_object( p_parser ) ); \ - modules.append( cbl ); \ -\ +void ModuleListConfigControl::checkbox_lists( module_t *p_parser ) +{ + QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) ); + checkBoxListItem *cbl = new checkBoxListItem; + + CONNECT( cb, stateChanged( int ), this, onUpdate() ); + const char *help = module_get_help( p_parser ); + if( help != NULL ) + cb->setToolTip( formatTooltip( qtr( help ) ) ); + cbl->checkBox = cb; + + cbl->psz_module = strdup( module_get_object( p_parser ) ); + modules.append( cbl ); + if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \ - cbl->checkBox->setChecked( true ); \ + cbl->checkBox->setChecked( true ); } @@ -764,14 +764,14 @@ void ModuleListConfigControl::finish( bool bycat ) if( p_cfg->i_type == CONFIG_SUBCATEGORY && p_cfg->value.i == p_item->min.i ) { - CHECKBOX_LISTS; + checkbox_lists( p_parser ); } } module_config_free (p_config); } else if( module_provides( p_parser, p_item->psz_type ) ) { - CHECKBOX_LISTS; + checkbox_lists(p_parser); } } module_list_free( p_list ); @@ -785,7 +785,6 @@ void ModuleListConfigControl::finish( bool bycat ) groupBox->setToolTip( formatTooltip(tipText) ); } } -#undef CHECKBOX_LISTS QString ModuleListConfigControl::getValue() const { diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp index fd7f7b7..bc509be 100644 --- a/modules/gui/qt4/components/preferences_widgets.hpp +++ b/modules/gui/qt4/components/preferences_widgets.hpp @@ -394,6 +394,7 @@ public slots: void onUpdate(); private: void finish( bool ); + void checkbox_lists(module_t*); QList<checkBoxListItem*> modules; QGroupBox *groupBox; QLineEdit *text; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
