diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-20 13:26:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-20 13:26:40 +0300 |
| commit | 6bf4a5aa68afb7d95632880c001286f2a721e1f5 (patch) | |
| tree | 3bfde7b41153e43b7057e92e37bdc87c38d503cb /src/gui | |
| parent | 0369cb5dc2e5dae4acdb0753c3b309ef874c96ae (diff) | |
| download | manaverse-6bf4a5aa68afb7d95632880c001286f2a721e1f5.tar.gz manaverse-6bf4a5aa68afb7d95632880c001286f2a721e1f5.tar.bz2 manaverse-6bf4a5aa68afb7d95632880c001286f2a721e1f5.tar.xz manaverse-6bf4a5aa68afb7d95632880c001286f2a721e1f5.zip | |
Move updatetype into separate file.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/windows/logindialog.cpp | 6 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 101f547f0..83041bc75 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -84,7 +84,7 @@ LoginDialog::LoginDialog(LoginData *const data, std::string serverName, mRegisterButton(new Button(this, _("Register"), "register", this)), // TRANSLATORS: login dialog checkbox mCustomUpdateHost(new CheckBox(this, _("Custom update host"), - mLoginData->updateType & LoginData::Upd_Custom, this, "customhost")), + mLoginData->updateType & UpdateType::Custom, this, "customhost")), mUpdateHostText(new TextField(this, serverConfig.getValue( "customUpdateHost", ""))), mUpdateListModel(nullptr), @@ -129,7 +129,7 @@ LoginDialog::LoginDialog(LoginData *const data, std::string serverName, mUpdateTypeDropDown->setActionEventId("updatetype"); mUpdateTypeDropDown->setSelected((mLoginData->updateType - | LoginData::Upd_Custom) ^ LoginData::Upd_Custom); + | UpdateType::Custom) ^ UpdateType::Custom); if (!mCustomUpdateHost->isSelected()) mUpdateHostText->setVisible(false); @@ -277,7 +277,7 @@ void LoginDialog::prepareUpdate() if (mCustomUpdateHost->isSelected() && !mUpdateHostText->getText().empty()) { - updateType |= LoginData::Upd_Custom; + updateType |= UpdateType::Custom; serverConfig.setValue("customUpdateHost", mUpdateHostText->getText()); diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 4e0f609ac..898d50425 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -275,7 +275,7 @@ void UpdaterWindow::enable() mPlayButton->setEnabled(true); mPlayButton->requestFocus(); - if (mUpdateType & LoginData::Upd_Close) + if (mUpdateType & UpdateType::Close) client->setState(STATE_LOAD_DATA); } |