Do not shadow in src/qt

This commit is contained in:
Pavel Janík
2016-09-09 13:43:29 +02:00
committed by Wladimir J. van der Laan
parent 26b370a937
commit f839350420
33 changed files with 215 additions and 215 deletions

View File

@@ -135,22 +135,22 @@ OptionsDialog::~OptionsDialog()
delete ui;
}
void OptionsDialog::setModel(OptionsModel *model)
void OptionsDialog::setModel(OptionsModel *_model)
{
this->model = model;
this->model = _model;
if(model)
if(_model)
{
/* check if client restart is needed and show persistent message */
if (model->isRestartRequired())
if (_model->isRestartRequired())
showRestartWarning(true);
QString strLabel = model->getOverriddenByCommandLine();
QString strLabel = _model->getOverriddenByCommandLine();
if (strLabel.isEmpty())
strLabel = tr("none");
ui->overriddenByCommandLineLabel->setText(strLabel);
mapper->setModel(model);
mapper->setModel(_model);
setMapper();
mapper->toFirst();