Commit ec0ceb44 authored by François Cartegnie's avatar François Cartegnie 🤞
Browse files

Qt: various visibility warnings fixs

parent d1a8b724
......@@ -1290,14 +1290,14 @@ void Compressor::enable( bool en )
}
}
void Compressor::updateSliders( float * controlVars )
void Compressor::updateSliders( float * p_controlVars )
{
for( int i = 0 ; i < NUM_CP_CTRL ; i++ )
{
if( oldControlVars[i] != controlVars[i] )
if( oldControlVars[i] != p_controlVars[i] )
{
compCtrl[i]->setValue(
(int)( controlVars[i] / comp_controls[i].f_resolution ) );
(int)( p_controlVars[i] / comp_controls[i].f_resolution ) );
}
}
}
......
......@@ -1365,12 +1365,12 @@ void KeySelectorControl::finish()
QMap<QString, QString> global_keys;
for (size_t i = 0; i < confsize; i++)
{
module_config_t *p_item = p_config + i;
module_config_t *p_config_item = p_config + i;
/* If we are a (non-global) key option not empty */
if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
&& !strncmp( p_item->psz_name , "key-", 4 )
&& !EMPTY_STR( p_item->psz_text ) )
if( CONFIG_ITEM(p_config_item->i_type) && p_config_item->psz_name != NULL
&& !strncmp( p_config_item->psz_name , "key-", 4 )
&& !EMPTY_STR( p_config_item->psz_text ) )
{
/*
Each tree item has:
......@@ -1379,11 +1379,11 @@ void KeySelectorControl::finish()
- KeyValue in String in column 1
*/
QTreeWidgetItem *treeItem = new QTreeWidgetItem();
treeItem->setText( 0, qtr( p_item->psz_text ) );
treeItem->setText( 0, qtr( p_config_item->psz_text ) );
treeItem->setData( 0, Qt::UserRole,
QVariant( qfu( p_item->psz_name ) ) );
QVariant( qfu( p_config_item->psz_name ) ) );
QString keys = qfu( p_item->value.psz );
QString keys = qfu( p_config_item->value.psz );
treeItem->setText( 1, keys );
treeItem->setToolTip( 1, qtr("Double click to change") );
treeItem->setToolTip( 2, qtr("Double click to change") );
......@@ -1392,12 +1392,12 @@ void KeySelectorControl::finish()
continue;
}
if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
&& !strncmp( p_item->psz_name , "global-key", 10 )
&& !EMPTY_STR( p_item->psz_text )
&& !EMPTY_STR( p_item->value.psz ) )
if( CONFIG_ITEM(p_config_item->i_type) && p_config_item->psz_name != NULL
&& !strncmp( p_config_item->psz_name , "global-key", 10 )
&& !EMPTY_STR( p_config_item->psz_text )
&& !EMPTY_STR( p_config_item->value.psz ) )
{
global_keys.insertMulti( qtr( p_item->psz_text ), qfu( p_item->value.psz ) );
global_keys.insertMulti( qtr( p_config_item->psz_text ), qfu( p_config_item->value.psz ) );
}
}
......
......@@ -369,8 +369,8 @@ void OpenDialog::enqueue( bool b_enqueue )
{
bool b_start = !i && !b_enqueue;
input_item_t *p_input;
p_input = input_item_New( qtu( itemsMRL[i] ), NULL );
input_item_t *p_input_item;
p_input_item = input_item_New( qtu( itemsMRL[i] ), NULL );
/* Take options from the UI, not from what we stored */
QStringList optionsList = getOptions().split( " :" );
......@@ -381,7 +381,7 @@ void OpenDialog::enqueue( bool b_enqueue )
QString qs = colon_unescape( optionsList[j] );
if( !qs.isEmpty() )
{
input_item_AddOption( p_input, qtu( qs ),
input_item_AddOption( p_input_item, qtu( qs ),
VLC_INPUT_OPTION_TRUSTED );
#ifdef DEBUG_QT
msg_Warn( p_intf, "Input option: %s", qtu( qs ) );
......@@ -391,10 +391,10 @@ void OpenDialog::enqueue( bool b_enqueue )
/* Switch between enqueuing and starting the item */
/* FIXME: playlist_AddInput() can fail */
playlist_AddInput( THEPL, p_input,
playlist_AddInput( THEPL, p_input_item,
PLAYLIST_APPEND | ( b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
PLAYLIST_END, b_pl ? true : false, pl_Unlocked );
vlc_gc_decref( p_input );
vlc_gc_decref( p_input_item );
/* Do not add the current MRL if playlist_AddInput fail */
RecentsMRL::getInstance( p_intf )->addRecent( itemsMRL[i] );
......
......@@ -85,8 +85,8 @@ PluginDialog::~PluginDialog()
/* Plugins tab */
PluginTab::PluginTab( intf_thread_t *p_intf )
: QVLCFrame( p_intf )
PluginTab::PluginTab( intf_thread_t *p_intf_ )
: QVLCFrame( p_intf_ )
{
QGridLayout *layout = new QGridLayout( this );
......
......@@ -544,7 +544,7 @@ void DroppingController::resetLine( const QString& line )
/* Overloading the AbstractController one, because we don't manage the
Spacing items in the same ways */
void DroppingController::createAndAddWidget( QBoxLayout *controlLayout,
void DroppingController::createAndAddWidget( QBoxLayout *newControlLayout,
int i_index,
buttonType_e i_type,
int i_option )
......@@ -574,7 +574,7 @@ void DroppingController::createAndAddWidget( QBoxLayout *controlLayout,
/* Install event Filter for drag'n drop */
label->installEventFilter( this );
controlLayout->insertWidget( i_index, label );
newControlLayout->insertWidget( i_index, label );
}
/* Normal Widgets */
......@@ -616,11 +616,11 @@ void DroppingController::createAndAddWidget( QBoxLayout *controlLayout,
/* Some Widgets are deactivated at creation */
widg->setEnabled( true );
widg->show();
controlLayout->insertWidget( i_index, widg );
newControlLayout->insertWidget( i_index, widg );
}
/* QList and QBoxLayout don't act the same with insert() */
if( i_index < 0 ) i_index = controlLayout->count() - 1;
if( i_index < 0 ) i_index = newControlLayout->count() - 1;
widgetList.insert( i_index, value );
}
......
......@@ -606,12 +606,12 @@ void VLMBroadcast::stop()
/****************
* VLMSchedule
****************/
VLMSchedule::VLMSchedule( const QString& name, const QString& input,
VLMSchedule::VLMSchedule( const QString& name_, const QString& input,
const QString& inputOptions,
const QString& output, QDateTime _schetime,
QDateTime _schedate, int _scherepeatnumber,
int _repeatDays, bool enabled, VLMDialog *parent )
: VLMAWidget( name, input, inputOptions, output, enabled, parent,
: VLMAWidget( name_, input, inputOptions, output, enabled, parent,
QVLM_Schedule )
{
nameLabel->setText( qtr("Schedule: ") + name );
......@@ -632,10 +632,10 @@ void VLMSchedule::update()
/****************
* VLMVOD
****************/
VLMVod::VLMVod( const QString& name, const QString& input,
VLMVod::VLMVod( const QString& name_, const QString& input,
const QString& inputOptions, const QString& output,
bool enabled, const QString& _mux, VLMDialog *parent)
: VLMAWidget( name, input, inputOptions, output, enabled, parent,
: VLMAWidget( name_, input, inputOptions, output, enabled, parent,
QVLM_VOD )
{
nameLabel->setText( qtr("VOD: ") + name );
......
......@@ -690,9 +690,9 @@ inline void InputManager::UpdateStats()
emit statisticsUpdated( input_GetItem( p_input ) );
}
inline void InputManager::UpdateMeta( input_item_t *p_item )
inline void InputManager::UpdateMeta( input_item_t *p_item_ )
{
emit metaChanged( p_item );
emit metaChanged( p_item_ );
}
inline void InputManager::UpdateMeta()
......@@ -832,8 +832,8 @@ void InputManager::reverse()
{
if( hasInput() )
{
float f_rate = var_GetFloat( p_input, "rate" );
var_SetFloat( p_input, "rate", -f_rate );
float f_rate_ = var_GetFloat( p_input, "rate" );
var_SetFloat( p_input, "rate", -f_rate_ );
}
}
......
......@@ -365,7 +365,7 @@ void MainInterface::reloadPrefs()
}
}
void MainInterface::createMainWidget( QSettings *settings )
void MainInterface::createMainWidget( QSettings *creationSettings )
{
/* Create the main Widget and the mainLayout */
QWidget *main = new QWidget;
......@@ -394,18 +394,20 @@ void MainInterface::createMainWidget( QSettings *settings )
}
mainLayout->insertWidget( 1, stackCentralW );
stackWidgetsSizes[bgWidget] = settings->value( "MainWindow/bgSize", QSize( 600, 0 ) ).toSize();
stackWidgetsSizes[bgWidget] =
creationSettings->value( "MainWindow/bgSize", QSize( 600, 0 ) ).toSize();
/* Resize even if no-auto-resize, because we are at creation */
resizeStack( stackWidgetsSizes[bgWidget].width(), stackWidgetsSizes[bgWidget].height() );
/* Create the CONTROLS Widget */
controls = new ControlsWidget( p_intf,
settings->value( "MainWindow/adv-controls", false ).toBool(), this );
creationSettings->value( "MainWindow/adv-controls", false ).toBool(), this );
inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC );
mainLayout->insertWidget( settings->value( "MainWindow/ToolbarPos", 0 ).toInt() ? 0: 3,
controls );
mainLayout->insertWidget(
creationSettings->value( "MainWindow/ToolbarPos", 0 ).toInt() ? 0: 3,
controls );
/* Visualisation, disabled for now, they SUCK */
#if 0
......
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