Commit 024c0a8f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: preferences, move a Macro to a normal function

(cherry picked from commit a728a7ede2500febe9003c9b1cc6170f167cb821)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0262b935
...@@ -723,22 +723,22 @@ ModuleListConfigControl::~ModuleListConfigControl() ...@@ -723,22 +723,22 @@ ModuleListConfigControl::~ModuleListConfigControl()
delete groupBox; delete groupBox;
} }
#define CHECKBOX_LISTS \ void ModuleListConfigControl::checkbox_lists( module_t *p_parser )
{ \ {
QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );\ QCheckBox *cb = new QCheckBox( qtr( module_GetLongName( p_parser ) ) );
checkBoxListItem *cbl = new checkBoxListItem; \ checkBoxListItem *cbl = new checkBoxListItem;
\
CONNECT( cb, stateChanged( int ), this, onUpdate() );\ CONNECT( cb, stateChanged( int ), this, onUpdate() );
const char *help = module_get_help( p_parser ); \ const char *help = module_get_help( p_parser );
if( help != NULL ) \ if( help != NULL )
cb->setToolTip( formatTooltip( qtr( help ) ) ); \ cb->setToolTip( formatTooltip( qtr( help ) ) );
cbl->checkBox = cb; \ cbl->checkBox = cb;
\
cbl->psz_module = strdup( module_get_object( p_parser ) ); \ cbl->psz_module = strdup( module_get_object( p_parser ) );
modules.append( cbl ); \ modules.append( cbl );
\
if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \ 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 ) ...@@ -764,14 +764,14 @@ void ModuleListConfigControl::finish( bool bycat )
if( p_cfg->i_type == CONFIG_SUBCATEGORY && if( p_cfg->i_type == CONFIG_SUBCATEGORY &&
p_cfg->value.i == p_item->min.i ) p_cfg->value.i == p_item->min.i )
{ {
CHECKBOX_LISTS; checkbox_lists( p_parser );
} }
} }
module_config_free (p_config); module_config_free (p_config);
} }
else if( module_provides( p_parser, p_item->psz_type ) ) else if( module_provides( p_parser, p_item->psz_type ) )
{ {
CHECKBOX_LISTS; checkbox_lists(p_parser);
} }
} }
module_list_free( p_list ); module_list_free( p_list );
...@@ -785,7 +785,6 @@ void ModuleListConfigControl::finish( bool bycat ) ...@@ -785,7 +785,6 @@ void ModuleListConfigControl::finish( bool bycat )
groupBox->setToolTip( formatTooltip(tipText) ); groupBox->setToolTip( formatTooltip(tipText) );
} }
} }
#undef CHECKBOX_LISTS
QString ModuleListConfigControl::getValue() const QString ModuleListConfigControl::getValue() const
{ {
......
...@@ -394,6 +394,7 @@ public slots: ...@@ -394,6 +394,7 @@ public slots:
void onUpdate(); void onUpdate();
private: private:
void finish( bool ); void finish( bool );
void checkbox_lists(module_t*);
QList<checkBoxListItem*> modules; QList<checkBoxListItem*> modules;
QGroupBox *groupBox; QGroupBox *groupBox;
QLineEdit *text; QLineEdit *text;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment