Skip to content

V
vlc-2-2
Commit 56e063c9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4 compilation fix

parent 93ec3e57
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
modules/gui/qt4/components/preferences.cpp
View file @ 56e063c9
...@@ -336,8 +336,6 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -336,8 +336,6 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
PrefsItemData * data ) : PrefsItemData * data ) :
QWidget( _parent ), p_intf( _p_intf ) QWidget( _parent ), p_intf( _p_intf )
{ {
module_config_t *p_item;
/* Find our module */ /* Find our module */
module_t *p_module = NULL; module_t *p_module = NULL;
if( data->i_type == TYPE_CATEGORY ) if( data->i_type == TYPE_CATEGORY )
...@@ -351,14 +349,16 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -351,14 +349,16 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
vlc_object_yield( p_module ); vlc_object_yield( p_module );
} }
if( p_module->b_submodule ) module_t *p_realmodule = p_module->b_submodule
p_item = ((module_t *)p_module->p_parent)->p_config; ? (module_t *)(p_module->p_parent)
else : p_module;
p_item = p_module->p_config;
module_config_t *p_item = p_realmodule->p_config;
module_config_t *p_end = p_item + p_realmodule->confsize;
if( data->i_type == TYPE_SUBCATEGORY || data->i_type == TYPE_CATSUBCAT ) if( data->i_type == TYPE_SUBCATEGORY || data->i_type == TYPE_CATSUBCAT )
{ {
do while (p_item < p_end)
{ {
if( p_item->i_type == CONFIG_SUBCATEGORY && if( p_item->i_type == CONFIG_SUBCATEGORY &&
( data->i_type == TYPE_SUBCATEGORY && ( data->i_type == TYPE_SUBCATEGORY &&
...@@ -366,8 +366,8 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -366,8 +366,8 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
( data->i_type == TYPE_CATSUBCAT && ( data->i_type == TYPE_CATSUBCAT &&
p_item->value.i == data->i_subcat_id ) ) p_item->value.i == data->i_subcat_id ) )
break; break;
if( p_item->i_type == CONFIG_HINT_END ) break; p_item++;
} while( p_item++ ); }
} }
global_layout = new QVBoxLayout(); global_layout = new QVBoxLayout();
...@@ -460,11 +460,11 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -460,11 +460,11 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
else i_line++; else i_line++;
controls.append( control ); controls.append( control );
} }
while( !(p_item->i_type == CONFIG_HINT_END || while( !( ( data->i_type == TYPE_SUBCATEGORY ||
( ( data->i_type == TYPE_SUBCATEGORY ||
data->i_type == TYPE_CATSUBCAT ) && data->i_type == TYPE_CATSUBCAT ) &&
( p_item->i_type == CONFIG_CATEGORY || ( p_item->i_type == CONFIG_CATEGORY ||
p_item->i_type == CONFIG_SUBCATEGORY ) ) ) && p_item++ ); p_item->i_type == CONFIG_SUBCATEGORY ) )
&& ( ++p_item < p_end ) );
if( box ) if( box )
{ {
......
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