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/editaddressdialog.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/editaddressdialog.cpp')
| -rw-r--r-- | src/qt/editaddressdialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 5f45031e9..a9ffe016f 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -11,11 +11,11 @@ #include <QDataWidgetMapper> #include <QMessageBox> -EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) : +EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) : QDialog(parent), ui(new Ui::EditAddressDialog), mapper(0), - mode(mode), + mode(_mode), model(0) { ui->setupUi(this); @@ -49,13 +49,13 @@ EditAddressDialog::~EditAddressDialog() delete ui; } -void EditAddressDialog::setModel(AddressTableModel *model) +void EditAddressDialog::setModel(AddressTableModel *_model) { - this->model = model; - if(!model) + this->model = _model; + if(!_model) return; - mapper->setModel(model); + mapper->setModel(_model); mapper->addMapping(ui->labelEdit, AddressTableModel::Label); mapper->addMapping(ui->addressEdit, AddressTableModel::Address); } @@ -137,8 +137,8 @@ QString EditAddressDialog::getAddress() const return address; } -void EditAddressDialog::setAddress(const QString &address) +void EditAddressDialog::setAddress(const QString &_address) { - this->address = address; - ui->addressEdit->setText(address); + this->address = _address; + ui->addressEdit->setText(_address); } |