Skip to content

V
vlc-2-2
Commit b2d37426 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf
Browse files
Options

qt4: preferences_widgets: Simplifications 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3aecc753
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 25 deletions
modules/gui/qt4/components/preferences_widgets.cpp
View file @ b2d37426
...@@ -707,11 +707,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, ...@@ -707,11 +707,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
finish( bycat ); finish( bycat );
int boxline = 0; int boxline = 0;
for( QVector<checkBoxListItem*>::iterator it = modules.begin(); foreach ( checkBoxListItem *it, modules )
it != modules.end(); ++it ) layoutGroupBox->addWidget( it->checkBox, boxline++, 0 );
{
layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 );
}
layoutGroupBox->addWidget( text, boxline, 0 ); layoutGroupBox->addWidget( text, boxline, 0 );
if( !l ) if( !l )
...@@ -731,11 +728,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this, ...@@ -731,11 +728,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
ModuleListConfigControl::~ModuleListConfigControl() ModuleListConfigControl::~ModuleListConfigControl()
{ {
for( QVector<checkBoxListItem*>::iterator it = modules.begin(); qDeleteAll( modules );
it != modules.end(); ++it ) modules.clear();
{
delete *it;
}
delete groupBox; delete groupBox;
} }
...@@ -811,21 +805,15 @@ QString ModuleListConfigControl::getValue() const ...@@ -811,21 +805,15 @@ QString ModuleListConfigControl::getValue() const
void ModuleListConfigControl::hide() void ModuleListConfigControl::hide()
{ {
for( QVector<checkBoxListItem*>::iterator it = modules.begin(); foreach ( checkBoxListItem *it, modules )
it != modules.end(); ++it ) it->checkBox->hide();
{
(*it)->checkBox->hide();
}
groupBox->hide(); groupBox->hide();
} }
void ModuleListConfigControl::show() void ModuleListConfigControl::show()
{ {
for( QVector<checkBoxListItem*>::iterator it = modules.begin(); foreach ( checkBoxListItem *it, modules )
it != modules.end(); ++it ) it->checkBox->show();
{
(*it)->checkBox->show();
}
groupBox->show(); groupBox->show();
} }
...@@ -835,19 +823,18 @@ void ModuleListConfigControl::onUpdate() ...@@ -835,19 +823,18 @@ void ModuleListConfigControl::onUpdate()
text->clear(); text->clear();
bool first = true; bool first = true;
for( QVector<checkBoxListItem*>::iterator it = modules.begin(); foreach ( checkBoxListItem *it, modules )
it != modules.end(); ++it )
{ {
if( (*it)->checkBox->isChecked() ) if( it->checkBox->isChecked() )
{ {
if( first ) if( first )
{ {
text->setText( text->text() + (*it)->psz_module ); text->setText( text->text() + it->psz_module );
first = false; first = false;
} }
else else
{ {
text->setText( text->text() + ":" + (*it)->psz_module ); text->setText( text->text() + ":" + it->psz_module );
} }
} }
} }
......
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