summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-12 21:28:54 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-12 21:28:54 +0300
commit5c66d91e3e69446081ef6254063ad638fbc48aca (patch)
treec3bb94057bcd4bdbb8568e815c7f18c44417a78a /src/gui
parentf6000c9088ee63428f65ee980f6751f85a7e7d7e (diff)
downloadmv-5c66d91e3e69446081ef6254063ad638fbc48aca.tar.gz
mv-5c66d91e3e69446081ef6254063ad638fbc48aca.tar.bz2
mv-5c66d91e3e69446081ef6254063ad638fbc48aca.tar.xz
mv-5c66d91e3e69446081ef6254063ad638fbc48aca.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/questswindow.cpp1
-rw-r--r--src/gui/quitdialog.cpp4
-rw-r--r--src/gui/statuspopup.cpp4
-rw-r--r--src/gui/statuspopup.h2
4 files changed, 5 insertions, 6 deletions
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<int>(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;