From c2a7004213529c403faeb6fdcc374699aa2f53b5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Aug 2013 22:00:27 +0300 Subject: improve getState/setState in Client. --- src/gui/changeemaildialog.cpp | 4 ++-- src/gui/changepassworddialog.cpp | 4 ++-- src/gui/charselectdialog.cpp | 8 ++++---- src/gui/connectiondialog.cpp | 2 +- src/gui/logindialog.cpp | 8 ++++---- src/gui/quitdialog.cpp | 14 +++++++------- src/gui/registerdialog.cpp | 6 +++--- src/gui/serverdialog.cpp | 8 ++++---- src/gui/unregisterdialog.cpp | 4 ++-- src/gui/updaterwindow.cpp | 8 ++++---- src/gui/worldselectdialog.cpp | 6 +++--- 11 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/gui') diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 3840dece3..3cf519336 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -115,7 +115,7 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) const std::string &eventId = event.getId(); if (eventId == "cancel") { - Client::setState(STATE_CHAR_SELECT); + client->setState(STATE_CHAR_SELECT); } else if (eventId == "change_email") { @@ -175,7 +175,7 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) mChangeEmailButton->setEnabled(false); // Set the new email address mLoginData->email = newFirstEmail; - Client::setState(STATE_CHANGEEMAIL_ATTEMPT); + client->setState(STATE_CHANGEEMAIL_ATTEMPT); } } } diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 84b21da8b..c337dccdf 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -94,7 +94,7 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) const std::string &eventId = event.getId(); if (eventId == "cancel") { - Client::setState(STATE_CHAR_SELECT); + client->setState(STATE_CHAR_SELECT); } else if (eventId == "change_password") { @@ -166,7 +166,7 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) // Set the new password mLoginData->password = oldPassword; mLoginData->newPassword = newFirstPass; - Client::setState(STATE_CHANGEPASSWORD_ATTEMPT); + client->setState(STATE_CHANGEPASSWORD_ATTEMPT); } } } diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 8daf1e279..92f1aeba8 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -266,16 +266,16 @@ void CharSelectDialog::action(const gcn::ActionEvent &event) } else if (eventId == "change_password") { - Client::setState(STATE_CHANGEPASSWORD); + client->setState(STATE_CHANGEPASSWORD); } else if (eventId == "change_email") { - Client::setState(STATE_CHANGEEMAIL); + client->setState(STATE_CHANGEEMAIL); } else if (eventId == "unregister") { Net::getCharServerHandler()->clear(); - Client::setState(STATE_UNREGISTER); + client->setState(STATE_UNREGISTER); } else if (eventId == "try delete character") { @@ -552,7 +552,7 @@ bool CharSelectDialog::selectByName(const std::string &name, void CharSelectDialog::close() { - Client::setState(STATE_SWITCH_LOGIN); + client->setState(STATE_SWITCH_LOGIN); Window::close(); } diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp index f6a80c91e..97894492f 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/connectiondialog.cpp @@ -59,7 +59,7 @@ ConnectionDialog::ConnectionDialog(const std::string &text, void ConnectionDialog::action(const gcn::ActionEvent &) { logger->log1("Cancel pressed"); - Client::setState(mCancelState); + client->setState(mCancelState); } void ConnectionDialog::draw(gcn::Graphics *graphics) diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 458cb15cd..701981008 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -276,7 +276,7 @@ void LoginDialog::action(const gcn::ActionEvent &event) { prepareUpdate(); mLoginData->registerLogin = false; - Client::setState(STATE_LOGIN_ATTEMPT); + client->setState(STATE_LOGIN_ATTEMPT); } else if (eventId == "server") { @@ -287,7 +287,7 @@ void LoginDialog::action(const gcn::ActionEvent &event) if (Net::getLoginHandler()->isRegistrationEnabled()) { prepareUpdate(); - Client::setState(STATE_REGISTER_PREP); + client->setState(STATE_REGISTER_PREP); } else if (!mLoginData->registerUrl.empty()) { @@ -339,7 +339,7 @@ bool LoginDialog::canSubmit() const { return !mUserField->getText().empty() && !mPassField->getText().empty() && - Client::getState() == STATE_LOGIN; + client->getState() == STATE_LOGIN; } void LoginDialog::prepareUpdate() @@ -408,6 +408,6 @@ void LoginDialog::prepareUpdate() void LoginDialog::close() { - Client::setState(STATE_SWITCH_SERVER); + client->setState(STATE_SWITCH_SERVER); Window::close(); } diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index cfdfb03c2..894d4ff24 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -77,7 +77,7 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe): addKeyListener(this); ContainerPlacer placer = getPlacer(0, 0); - const State state = Client::getState(); + const State state = client->getState(); mNeedForceQuit = (state == STATE_CHOOSE_SERVER || state == STATE_CONNECT_SERVER || state == STATE_LOGIN || state == STATE_PRE_LOGIN || state == STATE_LOGIN_ATTEMPT @@ -162,12 +162,12 @@ void QuitDialog::action(const gcn::ActionEvent &event) if (mForceQuit->isSelected()) { - Client::setState(STATE_FORCE_QUIT); + client->setState(STATE_FORCE_QUIT); } else if (mLogoutQuit->isSelected()) { Game::closeDialogs(); - Client::setState(STATE_EXIT); + client->setState(STATE_EXIT); } else if (mRate && mRate->isSelected()) { @@ -176,23 +176,23 @@ void QuitDialog::action(const gcn::ActionEvent &event) config.setValue("rated", true); if (mNeedForceQuit) { - Client::setState(STATE_FORCE_QUIT); + client->setState(STATE_FORCE_QUIT); } else { Game::closeDialogs(); - Client::setState(STATE_EXIT); + client->setState(STATE_EXIT); } } else if (Net::getGameHandler()->isConnected() && mSwitchAccountServer->isSelected()) { Game::closeDialogs(); - Client::setState(STATE_SWITCH_SERVER); + client->setState(STATE_SWITCH_SERVER); } else if (mSwitchCharacter->isSelected()) { - if (Client::getState() == STATE_GAME) + if (client->getState() == STATE_GAME) { Net::getCharServerHandler()->switchCharacter(); Game::closeDialogs(); diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp index a4de48807..233bf9bf9 100644 --- a/src/gui/registerdialog.cpp +++ b/src/gui/registerdialog.cpp @@ -274,7 +274,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) mLoginData->email = mEmailField->getText(); mLoginData->registerLogin = true; - Client::setState(STATE_REGISTER_ATTEMPT); + client->setState(STATE_REGISTER_ATTEMPT); } } } @@ -308,11 +308,11 @@ bool RegisterDialog::canSubmit() const return !mUserField->getText().empty() && !mPasswordField->getText().empty() && !mConfirmField->getText().empty() && - Client::getState() == STATE_REGISTER; + client->getState() == STATE_REGISTER; } void RegisterDialog::close() { - Client::setState(STATE_LOGIN); + client->setState(STATE_LOGIN); Window::close(); } diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 14f97576a..12ac7420a 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -363,7 +363,7 @@ ServerDialog::~ServerDialog() void ServerDialog::connectToSelectedServer() { - if (Client::getState() == STATE_CONNECT_SERVER) + if (client->getState() == STATE_CONNECT_SERVER) return; const int index = mServersList->getSelected(); @@ -402,7 +402,7 @@ void ServerDialog::connectToSelectedServer() config.setValue("usePersistentIP", mPersistentIPCheckBox->isSelected()); - Client::setState(STATE_CONNECT_SERVER); + client->setState(STATE_CONNECT_SERVER); } void ServerDialog::action(const gcn::ActionEvent &event) @@ -448,7 +448,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent) { case Input::KEY_GUI_CANCEL: keyEvent.consume(); - Client::setState(STATE_EXIT); + client->setState(STATE_EXIT); return; case Input::KEY_GUI_SELECT: @@ -869,6 +869,6 @@ void ServerDialog::close() { if (mDownload) mDownload->cancel(); - Client::setState(STATE_FORCE_QUIT); + client->setState(STATE_FORCE_QUIT); Window::close(); } diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index eabf13633..bb727b9ce 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -103,7 +103,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) const std::string &eventId = event.getId(); if (eventId == "cancel") { - Client::setState(STATE_CHAR_SELECT); + client->setState(STATE_CHAR_SELECT); } else if (eventId == "unregister") { @@ -149,7 +149,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) // No errors detected, unregister the new user. mUnRegisterButton->setEnabled(false); mLoginData->password = password; - Client::setState(STATE_UNREGISTER_ATTEMPT); + client->setState(STATE_UNREGISTER_ATTEMPT); } } } diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index f17621f6f..f41269179 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -257,7 +257,7 @@ void UpdaterWindow::enable() mPlayButton->requestFocus(); if (mUpdateType & LoginData::Upd_Close) - Client::setState(STATE_LOAD_DATA); + client->setState(STATE_LOAD_DATA); } void UpdaterWindow::action(const gcn::ActionEvent &event) @@ -276,7 +276,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event) } else if (eventId == "play") { - Client::setState(STATE_LOAD_DATA); + client->setState(STATE_LOAD_DATA); } } @@ -286,7 +286,7 @@ void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent) if (actionId == static_cast(Input::KEY_GUI_CANCEL)) { action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId())); - Client::setState(STATE_LOGIN); + client->setState(STATE_LOGIN); } else if (actionId == static_cast(Input::KEY_GUI_SELECT) || actionId == static_cast(Input::KEY_GUI_SELECT2)) @@ -465,7 +465,7 @@ int UpdaterWindow::updateProgress(void *ptr, DownloadStatus status, uw->setProgress(progress); - if (Client::getState() != STATE_UPDATE + if (client->getState() != STATE_UPDATE || uw->mDownloadStatus == UPDATE_ERROR) { // If the action was canceled return an error code to stop the mThread diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index e8ed35ab2..37dbbc3cf 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -141,12 +141,12 @@ void WorldSelectDialog::action(const gcn::ActionEvent &event) Net::getLoginHandler()->chooseServer(mWorldList->getSelected()); // Check in case netcode moves us forward - if (Client::getState() == STATE_WORLD_SELECT) - Client::setState(STATE_WORLD_SELECT_ATTEMPT); + if (client->getState() == STATE_WORLD_SELECT) + client->setState(STATE_WORLD_SELECT_ATTEMPT); } else if (eventId == "login") { - Client::setState(STATE_PRE_LOGIN); + client->setState(STATE_PRE_LOGIN); } } -- cgit v1.2.3-70-g09d2