Do not shadow in src/qt
This commit is contained in:
committed by
Wladimir J. van der Laan
parent
26b370a937
commit
f839350420
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user