Fix code style.

8 files changed, 40 insertions, 20 deletions

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 33f602acc..5809eeec7 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -1026,7 +1026,8 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *const aroundBeing,
 
 //            Being *being = (*i);
 
-            const bool valid = validateBeing(aroundBeing, being, type, excluded, 50);
+            const bool valid = validateBeing(aroundBeing, being,
+                                             type, excluded, 50);
             int d = being->getDistance();
 //            logger->log("dist: %d", dist);
 //            logger->log("name: %s, %d, %d", being->getName().c_str(), (int)valid, d);
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index b011b0c6f..1272d1e86 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -153,7 +153,8 @@ class ActorSpriteManager: public ConfigListener
         * Finds a nearest being by name and (optionally) by type.
         */
         Being *findNearestByName(const std::string &name,
-                                 const Being::Type type = Being::UNKNOWN) const;
+                                 const Being::Type type = Being::UNKNOWN
+                                ) const;
 
        /**
         * Heal all players in distance.
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 084e3b5af..502034fe8 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -388,7 +388,8 @@ void CommandHandler::handleListChannels(const std::string &args A_UNUSED,
     Net::getChatHandler()->channelList();
 }
 
-void CommandHandler::handleCreateParty(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleCreateParty(const std::string &args,
+                                       ChatTab *const tab)
 {
     if (!tab)
         return;
@@ -399,7 +400,8 @@ void CommandHandler::handleCreateParty(const std::string &args, ChatTab *const t
         Net::getPartyHandler()->create(args);
 }
 
-void CommandHandler::handleCreateGuild(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleCreateGuild(const std::string &args,
+                                       ChatTab *const tab)
 {
     if (!tab)
         return;
@@ -515,7 +517,8 @@ void CommandHandler::handleFriend(const std::string &args, ChatTab *const tab)
     changeRelation(args, PlayerRelation::FRIEND, _("friend"), tab);
 }
 
-void CommandHandler::handleDisregard(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleDisregard(const std::string &args,
+                                     ChatTab *const tab)
 {
     changeRelation(args, PlayerRelation::DISREGARDED, _("disregarded"), tab);
 }
@@ -569,7 +572,8 @@ void CommandHandler::changeRelation(const std::string &args,
     }
 }
 
-void CommandHandler::handleUnignore(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleUnignore(const std::string &args,
+                                    ChatTab *const tab)
 {
     if (args.empty())
     {
@@ -599,7 +603,8 @@ void CommandHandler::handleUnignore(const std::string &args, ChatTab *const tab)
     }
 }
 
-void CommandHandler::handleBlackList(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleBlackList(const std::string &args,
+                                     ChatTab *const tab)
 {
     changeRelation(args, PlayerRelation::BLACKLISTED, _("blacklisted"), tab);
 }
@@ -651,7 +656,8 @@ void CommandHandler::handleShowAll(const std::string &args A_UNUSED,
         actorSpriteManager->printAllToChat();
 }
 
-void CommandHandler::handleMove(const std::string &args, ChatTab *const tab A_UNUSED)
+void CommandHandler::handleMove(const std::string &args,
+                                ChatTab *const tab A_UNUSED)
 {
     int x = 0;
     int y = 0;
@@ -754,7 +760,8 @@ void CommandHandler::handleEmote(const std::string &args,
         player_node->emote(static_cast<uint8_t>(atoi(args.c_str())));
 }
 
-void CommandHandler::handleAway(const std::string &args, ChatTab *const tab A_UNUSED)
+void CommandHandler::handleAway(const std::string &args,
+                                ChatTab *const tab A_UNUSED)
 {
     if (player_node)
         player_node->setAway(args);
@@ -785,7 +792,8 @@ void CommandHandler::handleFollow(const std::string &args, ChatTab *const tab)
     }
 }
 
-void CommandHandler::handleImitation(const std::string &args, ChatTab *const tab)
+void CommandHandler::handleImitation(const std::string &args,
+                                     ChatTab *const tab)
 {
     if (!player_node)
         return;
@@ -798,7 +806,8 @@ void CommandHandler::handleImitation(const std::string &args, ChatTab *const tab
         player_node->setImitate("");
 }
 
-void CommandHandler::handleHeal(const std::string &args, ChatTab *const tab A_UNUSED)
+void CommandHandler::handleHeal(const std::string &args,
+                                ChatTab *const tab A_UNUSED)
 {
     if (!actorSpriteManager)
         return;
@@ -816,12 +825,14 @@ void CommandHandler::handleHeal(const std::string &args, ChatTab *const tab A_UN
     }
 }
 
-void CommandHandler::handleHack(const std::string &args, ChatTab *const tab A_UNUSED)
+void CommandHandler::handleHack(const std::string &args,
+                                ChatTab *const tab A_UNUSED)
 {
     Net::getChatHandler()->sendRaw(args);
 }
 
-void CommandHandler::handleMail(const std::string &args, ChatTab *const tab A_UNUSED)
+void CommandHandler::handleMail(const std::string &args,
+                                ChatTab *const tab A_UNUSED)
 {
     if (auctionManager && auctionManager->getEnableAuctionBot())
         auctionManager->sendMail(args);
@@ -1143,7 +1154,8 @@ void CommandHandler::handleDumpTests(const std::string &args A_UNUSED,
     outStringNormal(tab, str, str);
 }
 
-void CommandHandler::outStringNormal(ChatTab *const tab, const std::string &str,
+void CommandHandler::outStringNormal(ChatTab *const tab,
+                                     const std::string &str,
                                      const std::string &def)
 {
     if (!player_node)
diff --git a/src/commandhandler.h b/src/commandhandler.h
index b56b234ce..279673653 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -221,7 +221,8 @@ class CommandHandler
         /**
          * Handle closeall command.
          */
-        static void handleCloseAll(const std::string &args, ChatTab *const tab);
+        static void handleCloseAll(const std::string &args,
+                                   ChatTab *const tab);
 
         /**
          * Handle ignoreall command.
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 5d2191b59..208437b57 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -242,14 +242,16 @@ std::string ConfigurationObject::getValue(const std::string &key,
     return ((iter != mOptions.end()) ? iter->second : deflt);
 }
 
-int ConfigurationObject::getValue(const std::string &key, const int deflt) const
+int ConfigurationObject::getValue(const std::string &key,
+                                  const int deflt) const
 {
     GETLOG();
     const Options::const_iterator iter = mOptions.find(key);
     return (iter != mOptions.end()) ? atoi(iter->second.c_str()) : deflt;
 }
 
-int ConfigurationObject::getValueInt(const std::string &key, const int deflt) const
+int ConfigurationObject::getValueInt(const std::string &key,
+                                     const int deflt) const
 {
     GETLOG();
     const Options::const_iterator iter = mOptions.find(key);
diff --git a/src/depricatedevent.h b/src/depricatedevent.h
index 7262a0a37..07e1466d5 100644
--- a/src/depricatedevent.h
+++ b/src/depricatedevent.h
@@ -152,7 +152,8 @@ class DepricatedEvent
         const throw (BadDepricatedEvent);
 
         // Sends event to all listener on the channel
-        static void trigger(const Channels channel, const DepricatedEvent &event);
+        static void trigger(const Channels channel,
+                            const DepricatedEvent &event);
 
         // Removes a listener from all channels
         static void remove(Listener *const listener);
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 53ccf6eeb..bcc360d14 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -392,7 +392,8 @@ void Setup_Theme::apply()
         config.setValue("secureFont", "fonts/" + getFileName(mSecureFont));
         config.setValue("japanFont", "fonts/" + getFileName(mJapanFont));
         config.setValue("fontSize", mFontSizeDropDown->getSelected() + 9);
-        config.setValue("npcfontSize", mNpcFontSizeDropDown->getSelected() + 9);
+        config.setValue("npcfontSize",
+            mNpcFontSizeDropDown->getSelected() + 9);
         gui->updateFonts();
     }
 }
diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp
index 306298eeb..5463c648c 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/safeopenglgraphics.cpp
@@ -104,7 +104,8 @@ static inline void drawQuad(const Image *image,
     }
 }
 
-static inline void drawRescaledQuad(const Image *const image, int srcX, int srcY,
+static inline void drawRescaledQuad(const Image *const image,
+                                    int srcX, int srcY,
                                     int dstX, int dstY, int width, int height,
                                     int desiredWidth, int desiredHeight)
 {