diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 22:10:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 22:11:30 +0300 |
| commit | 703a3c4df3732e3e88559147001260f3355d42d6 (patch) | |
| tree | fcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/gui/logindialog.cpp | |
| parent | 3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff) | |
| download | manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2 manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz manaplus-703a3c4df3732e3e88559147001260f3355d42d6.zip | |
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/gui/logindialog.cpp')
| -rw-r--r-- | src/gui/logindialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index ab5dc7401..adf499f75 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -81,10 +81,10 @@ public: } }; -LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, +LoginDialog::LoginDialog(LoginData *data, std::string serverName, std::string *updateHost): Window(_("Login")), - mLoginData(loginData), + mLoginData(data), mUpdateHost(updateHost), mServerName(serverName) { @@ -94,7 +94,7 @@ LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, gcn::Label *userLabel = new Label(_("Name:")); gcn::Label *passLabel = new Label(_("Password:")); mCustomUpdateHost = new CheckBox(_("Custom update host"), - loginData->updateType & LoginData::Upd_Custom, this, "customhost"); + mLoginData->updateType & LoginData::Upd_Custom, this, "customhost"); mUpdateHostText = new TextField(serverConfig.getValue( "customUpdateHost", "")); @@ -112,7 +112,7 @@ LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, mUpdateTypeModel = new UpdateTypeModel(); mUpdateTypeDropDown = new DropDown(mUpdateTypeModel); mUpdateTypeDropDown->setActionEventId("updatetype"); - mUpdateTypeDropDown->setSelected((loginData->updateType + mUpdateTypeDropDown->setSelected((mLoginData->updateType | LoginData::Upd_Custom) ^ LoginData::Upd_Custom); if (!mCustomUpdateHost->isSelected()) |