Fix code style.

10 files changed, 19 insertions, 8 deletions

diff --git a/src/being.h b/src/being.h
index 6413a1059..8005881ca 100644
--- a/src/being.h
+++ b/src/being.h
@@ -846,7 +846,7 @@ class Being : public ActorSprite, public ConfigListener
                          const AttackType type,
                          const int attackId) const A_WARN_UNUSED;
 
-        Cursor::Cursor getHoverCursor() A_WARN_UNUSED
+        Cursor::Cursor getHoverCursor() const A_WARN_UNUSED
         { return mInfo ? mInfo->getHoverCursor() : Cursor::CURSOR_POINTER; }
 
         static uint8_t genderToInt(const Gender sex) A_WARN_UNUSED;
diff --git a/src/client.cpp b/src/client.cpp
index fe5ec8e16..e71ae370b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1509,7 +1509,8 @@ int Client::gameExec()
                     break;
 
                 case STATE_CHANGEPASSWORD_ATTEMPT:
-                    BLOCK_START("Client::gameExec STATE_CHANGEPASSWORD_ATTEMPT")
+                    BLOCK_START("Client::gameExec "
+                        "STATE_CHANGEPASSWORD_ATTEMPT")
                     logger->log1("State: CHANGE PASSWORD ATTEMPT");
                     Net::getLoginHandler()->changePassword(loginData.username,
                         loginData.password, loginData.newPassword);
@@ -1517,7 +1518,8 @@ int Client::gameExec()
                     break;
 
                 case STATE_CHANGEPASSWORD_SUCCESS:
-                    BLOCK_START("Client::gameExec STATE_CHANGEPASSWORD_SUCCESS")
+                    BLOCK_START("Client::gameExec "
+                        "STATE_CHANGEPASSWORD_SUCCESS")
                     logger->log1("State: CHANGE PASSWORD SUCCESS");
                     mCurrentDialog = new OkDialog(_("Password Change"),
                         _("Password changed successfully!"), DIALOG_ERROR);
diff --git a/src/gui/palette.h b/src/gui/palette.h
index e36f59aae..1918a27ac 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -67,7 +67,8 @@ class Palette
          *
          * @return the requested color or Palette::BLACK
          */
-        const gcn::Color &getCharColor(const signed char c, bool &valid) A_WARN_UNUSED;
+        const gcn::Color &getCharColor(const signed char c,
+                                       bool &valid) A_WARN_UNUSED;
 
         int getIdByChar(const signed char c, bool &valid) A_WARN_UNUSED;
 
@@ -80,7 +81,8 @@ class Palette
          *
          * @return the requested color
          */
-        inline const gcn::Color &getColor(int type, int alpha = 255) A_WARN_UNUSED
+        inline const gcn::Color &getColor(int type,
+                                          int alpha = 255) A_WARN_UNUSED
         {
             if (type >= static_cast<signed>(mColors.size()) || type < 0)
             {
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 476640c46..eb2d51c56 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -108,6 +108,7 @@ class ModeListModel final : public gcn::ListModel
         StringVect mVideoModes;
 };
 
+#ifndef ANDROID
 static bool modeSorter(std::string mode1, std::string mode2);
 
 static bool modeSorter(std::string mode1, std::string mode2)
@@ -129,6 +130,7 @@ static bool modeSorter(std::string mode1, std::string mode2)
 
     return false;
 }
+#endif
 
 ModeListModel::ModeListModel()
 {
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index fa3980024..4dd1df2b6 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -62,7 +62,6 @@
 #undef malloc
 #endif
 
-
 class NameFunctuator final
 {
     public:
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 1b86b5dc9..6d66a1b63 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -89,7 +89,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
     addButton(":-)", _("Smilies"), x, h,
               Input::KEY_WINDOW_EMOTE_SHORTCUT, emoteShortcutWindow);
     addButton(N_("CH"), _("Chat"), x, h,
-              Input::KEY_WINDOW_CHAT, minimap,
+              Input::KEY_WINDOW_CHAT, chatWindow,
 #ifdef ANDROID
               true);
 #else
diff --git a/src/guichan/include/guichan/input.hpp b/src/guichan/include/guichan/input.hpp
index 229dfe9a6..e5f45c20a 100644
--- a/src/guichan/include/guichan/input.hpp
+++ b/src/guichan/include/guichan/input.hpp
@@ -47,6 +47,8 @@
 
 #include "guichan/platform.hpp"
 
+#include "localconsts.h"
+
 namespace gcn
 {
     class KeyInput;
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 37a1f22c4..46b6f100e 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -23,6 +23,8 @@
 #ifndef PARTYHANDLER_H
 #define PARTYHANDLER_H
 
+#include "localconsts.h"
+
 #include <string>
 
 class Being;
diff --git a/src/properties.h b/src/properties.h
index 82664c600..b2cdb6e3c 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -23,6 +23,8 @@
 #ifndef PROPERTIES_H
 #define PROPERTIES_H
 
+#include "localconsts.h"
+
 #include <map>
 #include <sstream>
 #include <string>
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 51d762569..15ac55853 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -254,7 +254,6 @@ Map *MapReader::readMap(XmlNodePtr node, const std::string &path)
 
     // Take the filename off the path
     const std::string pathDir = path.substr(0, path.rfind("/") + 1);
-    const std::string fileName = path.substr(path.rfind("/") + 1);
 
     const int w = XML::getProperty(node, "width", 0);
     const int h = XML::getProperty(node, "height", 0);
@@ -278,6 +277,7 @@ Map *MapReader::readMap(XmlNodePtr node, const std::string &path)
 #ifdef USE_OPENGL
     if (graphicsManager.getUseAtlases())
     {
+        const std::string fileName = path.substr(path.rfind("/") + 1);
         const MapDB::MapInfo *const info = MapDB::getMapAtlas(fileName);
         if (info)
         {