4 files changed, 22 insertions, 14 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 1457b6dd..e913bb0a 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -551,4 +551,4 @@ void ManaServItemDB::checkItemInfo(ItemInfo* itemInfo)
     // Add specific Manaserv checks here
 }
 
-}; // namespace ManaServ
+} // namespace ManaServ
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index e80f2cd0..aa6e62c0 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -33,9 +33,13 @@
 class ItemInfo;
 class SpriteDisplay;
 
-// Used to make the compiler uderstand the iteminfo friendship.
-namespace TmwAthena { class TaItemDB; };
-namespace ManaServ { class ManaServItemDB; };
+namespace TmwAthena {
+class TaItemDB;
+}
+
+namespace ManaServ {
+class ManaServItemDB;
+}
 
 /**
  * Nano-description functions
@@ -48,10 +52,10 @@ class ItemStat
 
     public:
         ItemStat(const std::string &tag,
-             const std::string &format):
+                 const std::string &format):
         mTag(tag), mFormat(format) {}
 
-        bool operator ==(std::string &name) const
+        bool operator ==(const std::string &name) const
         { return mTag == name; }
 
     private:
@@ -176,7 +180,7 @@ class TaItemDB: public ItemDB
         void checkItemInfo(ItemInfo* itemInfo);
 };
 
-}; // namespace TmwAthena
+} // namespace TmwAthena
 
 namespace ManaServ {
 
@@ -203,7 +207,7 @@ class ManaServItemDB: public ItemDB
         void checkItemInfo(ItemInfo* itemInfo);
 };
 
-}; // namespace ManaServ
+} // namespace ManaServ
 
 extern ItemDB *itemDb;
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 4ab66597..24872060 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -60,9 +60,13 @@ enum ItemType
     ITEM_SPRITE_HAIR // 15
 };
 
-// Used to make the compiler uderstand the iteminfo friendship.
-namespace TmwAthena { class TaItemDB; };
-namespace ManaServ { class ManaServItemDB; };
+namespace TmwAthena {
+class TaItemDB;
+}
+
+namespace ManaServ {
+class ManaServItemDB;
+}
 
 /**
  * Defines a class for storing generic item infos.
@@ -256,4 +260,4 @@ class ManaServItemInfo: public ItemInfo
 
 } // namespace ManaServ
 
-#endif
+#endif // ITEMINFO_H
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 349e2948..f60009ab 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -33,7 +33,7 @@ Resource::~Resource()
 
 void Resource::incRef()
 {
-    mRefCount++;
+    ++mRefCount;
 }
 
 void Resource::decRef()
@@ -44,7 +44,7 @@ void Resource::decRef()
         assert(false);
     }
 
-    mRefCount--;
+    --mRefCount;
 
     if (mRefCount == 0)
     {