diff options
| author | Pavel JanÃk <[email protected]> | 2016-09-09 13:43:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-23 12:42:00 +0200 |
| commit | f8393504205089112cdec27ac1829282b76b94a3 (patch) | |
| tree | c38c196ef0873e372b63066f5e8b31e0f6e82b97 /src/qt/optionsdialog.cpp | |
| parent | Merge #8636: Implement NULLDUMMY softfork (BIP147) (diff) | |
| download | discoin-f8393504205089112cdec27ac1829282b76b94a3.tar.xz discoin-f8393504205089112cdec27ac1829282b76b94a3.zip | |
Do not shadow in src/qt
Diffstat (limited to 'src/qt/optionsdialog.cpp')
| -rw-r--r-- | src/qt/optionsdialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index f73bb8706..588059d0c 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -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(); |