From 5c66d91e3e69446081ef6254063ad638fbc48aca Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 12 Mar 2013 21:28:54 +0300 Subject: Fix code style. --- src/gui/questswindow.cpp | 1 - src/gui/quitdialog.cpp | 4 ++-- src/gui/statuspopup.cpp | 4 ++-- src/gui/statuspopup.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp index 390c60314..c4f3a6928 100644 --- a/src/gui/questswindow.cpp +++ b/src/gui/questswindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "effectmanager.h" #include "localplayer.h" -#include "map.h" #include "soundmanager.h" #include "gui/gui.h" diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index b2e3f7d94..51e6cdba7 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -70,10 +70,10 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe): const State state = Client::getState(); - mNeedForceQuit = state == STATE_CHOOSE_SERVER + mNeedForceQuit = (state == STATE_CHOOSE_SERVER || state == STATE_CONNECT_SERVER || state == STATE_LOGIN || state == STATE_PRE_LOGIN || state == STATE_LOGIN_ATTEMPT - || state == STATE_UPDATE || state == STATE_LOAD_DATA; + || state == STATE_UPDATE || state == STATE_LOAD_DATA); // All states, when we're not logged in to someone. if (mNeedForceQuit) diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index f4b06991c..d8234b81a 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -189,8 +189,8 @@ void StatusPopup::view(const int x, const int y) } void StatusPopup::setLabelText(Label *const label, - const std::string &text, - const Input::KeyAction key) const + const std::string &text, + const Input::KeyAction key) const { label->setCaption(strprintf("%s %s", text.c_str(), inputManager.getKeyValueString(static_cast(key)).c_str())); diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h index 128345d51..1547d9cfc 100644 --- a/src/gui/statuspopup.h +++ b/src/gui/statuspopup.h @@ -64,7 +64,7 @@ class StatusPopup final : public Popup void updateLabels(); void setLabelText(Label *const label, const std::string &text, - const Input::KeyAction key) const; + const Input::KeyAction key) const; Label *mMoveType; Label *mCrazyMoveType; -- cgit v1.2.3-60-g2f50