Fix code style.

7 files changed, 19 insertions, 14 deletions

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index edd1db2aa..1104f034a 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -705,7 +705,8 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing,
         beingSorter.priorityBeings = &priorityMobsMap;
         if (ignoreAttackMobs.find("") != ignoreAttackMobs.end())
             ignoreDefault = true;
-        std::map<std::string, int>::const_iterator itr = attackMobsMap.find("");
+        std::map<std::string, int>::const_iterator
+            itr = attackMobsMap.find("");
         if (itr != attackMobsMap.end())
             defaultAttackIndex = (*itr).second;
         itr = priorityMobsMap.find("");
@@ -1323,7 +1324,8 @@ void ActorSpriteManager::rebuildAttackMobs()
 
 int ActorSpriteManager::getPriorityAttackMobIndex(std::string name)
 {
-    std::map<std::string, int>::const_iterator i = mPriorityAttackMobsMap.find(name);
+    std::map<std::string, int>::const_iterator
+        i = mPriorityAttackMobsMap.find(name);
     if (i == mPriorityAttackMobsMap.end())
         return -1;
 
diff --git a/src/being.cpp b/src/being.cpp
index 090e7d10d..3d89c71ba 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -2188,7 +2188,8 @@ void Being::recalcSpritesOrder()
         if (info.mDrawBefore[dir] > 0)
         {
             int id2 = mSpriteIDs[info.mDrawBefore[dir]];
-            std::map<int, int>::const_iterator orderIt = itemSlotRemap.find(id2);
+            std::map<int, int>::const_iterator
+                orderIt = itemSlotRemap.find(id2);
             if (orderIt != itemSlotRemap.end())
             {
 //                logger->log("found duplicate (before)");
@@ -2211,7 +2212,8 @@ void Being::recalcSpritesOrder()
         else if (info.mDrawAfter[dir] > 0)
         {
             int id2 = mSpriteIDs[info.mDrawAfter[dir]];
-            std::map<int, int>::const_iterator orderIt = itemSlotRemap.find(id2);
+            std::map<int, int>::const_iterator
+                orderIt = itemSlotRemap.find(id2);
             if (orderIt != itemSlotRemap.end())
             {
 //                logger->log("found duplicate (after)");
@@ -2256,7 +2258,8 @@ void Being::recalcSpritesOrder()
             int idx1 = -1;
 //            logger->log("item %d, id=%d", slot, id);
             int reorder = 0;
-            std::map<int, int>::const_iterator orderIt = itemSlotRemap.find(id);
+            std::map<int, int>::const_iterator
+                orderIt = itemSlotRemap.find(id);
             if (orderIt != itemSlotRemap.end())
                 reorder = orderIt->second;
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 0da8c1bd4..e79cbf56b 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -559,7 +559,7 @@ void Graphics::calcImagePattern(GraphicsVertexes* vert,
             srcRect.w = static_cast<Uint16>(dw);
             srcRect.h = static_cast<Uint16>(dh);
 
-            if (SDL_FakeUpperBlit(image->mSDLSurface, &srcRect,
+            if (sdl_FakeUpperBlit(image->mSDLSurface, &srcRect,
                 mTarget, &dstRect) == 1)
             {
                 vert->pushSDL(srcRect, dstRect);
@@ -588,7 +588,7 @@ void Graphics::calcTile(ImageVertexes *vert, int x, int y)
     rect->src.y = static_cast<short>(image->mBounds.y);
     rect->src.w = static_cast<Uint16>(image->mBounds.w);
     rect->src.h = static_cast<Uint16>(image->mBounds.h);
-    if (SDL_FakeUpperBlit(image->mSDLSurface, &rect->src,
+    if (sdl_FakeUpperBlit(image->mSDLSurface, &rect->src,
         mTarget, &rect->dst) == 1)
     {
         vert->sdl.push_back(rect);
@@ -668,8 +668,8 @@ bool Graphics::calcWindow(GraphicsVertexes* vert,
         imgRect.grid[4]);
 }
 
-int Graphics::SDL_FakeUpperBlit (SDL_Surface *src, SDL_Rect *srcrect,
-                                 SDL_Surface *dst, SDL_Rect *dstrect)
+int Graphics::SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect,
+                                SDL_Surface *dst, SDL_Rect *dstrect)
 {
     SDL_Rect fulldst;
     int srcx, srcy, w, h;
diff --git a/src/graphics.h b/src/graphics.h
index a2e25b5a8..53b4b7c72 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -279,8 +279,8 @@ class Graphics : public gcn::SDLGraphics
         int mHeight;
 
     protected:
-        int SDL_FakeUpperBlit (SDL_Surface *src, SDL_Rect *srcrect,
-                               SDL_Surface *dst, SDL_Rect *dstrect);
+        int SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect,
+                              SDL_Surface *dst, SDL_Rect *dstrect);
 
         int mBpp;
         bool mFullscreen;
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 13a837dfb..7bc0444ed 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -338,7 +338,7 @@ bool GuildManager::process(std::string msg)
         return true;
     }
     else if (!haveNick && (findCutLast(msg, " has been removed "
-             "from the Guild.") || findCutLast(msg," has left the Guild.")))
+             "from the Guild.") || findCutLast(msg, " has left the Guild.")))
     {
         Guild *guild = createGuild();
         if (!guild)
diff --git a/src/resources/image.h b/src/resources/image.h
index 9ac2b163e..eb211341c 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -162,7 +162,7 @@ class Image : public Resource
          *
          * @return A new Image* object.
          */
-        Image* SDLgetScaledImage(int width, int height);
+        Image* SDLGetScaledImage(int width, int height);
 
         /**
          * Merges two image SDL_Surfaces together. This is for SDL use only, as
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 62564e0e0..efe5f9efb 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -175,7 +175,7 @@ const std::string findSameSubstring(const std::string &str1,
 }
 
 const std::string findSameSubstringI(const std::string &s1,
-                                    const std::string &s2)
+                                     const std::string &s2)
 {
     std::string str1 = s1;
     std::string str2 = s2;