From 3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 26 Sep 2014 23:25:32 +0300
Subject: Fix code style.

---
 src/resources/beingcommon.cpp     | 3 +--
 src/resources/beingcommon.h       | 4 ++--
 src/resources/db/homunculusdb.cpp | 8 ++++----
 src/resources/db/itemdb.cpp       | 1 -
 src/resources/db/mercenarydb.cpp  | 5 ++---
 src/resources/db/monsterdb.cpp    | 1 -
 6 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 4b685f8bf..4f5bee935 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -24,7 +24,6 @@
 #include "logger.h"
 
 #include "utils/files.h"
-#include "utils/stringutils.h"
 
 #include "resources/beinginfo.h"
 #include "resources/spritereference.h"
@@ -69,7 +68,7 @@ void BeingCommon::getIncludeFiles(const std::string &dir,
     std::sort(list.begin(), list.end());
 }
 
-bool BeingCommon::readObjectNodes(XmlNodePtr &spriteNode,
+bool BeingCommon::readObjectNodes(XmlNodePtrConst &spriteNode,
                                   SpriteDisplay &display,
                                   BeingInfo *const currentInfo,
                                   const std::string &dbName)
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index 301dc284e..da5de53a4 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -58,10 +58,10 @@ namespace BeingCommon
                          StringVect &list,
                          const std::string &ext);
 
-    bool readObjectNodes(XmlNodePtr &node,
+    bool readObjectNodes(XmlNodePtrConst &spriteNode,
                          SpriteDisplay &display,
                          BeingInfo *const currentInfo,
                          const std::string &dbName);
-}
+}  // namespace BeingCommon
 
 #endif  // RESOURCES_BEINGCOMMON_H
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 317d0c2df..291fa8262 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -26,12 +26,10 @@
 
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
-#include "resources/spritereference.h"
 
 #include "resources/map/blockmask.h"
 
 #include "utils/dtor.h"
-#include "utils/gettext.h"
 
 #include "configuration.h"
 
@@ -76,7 +74,8 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
     {
         if (xmlNameEqual(homunculusNode, "include"))
         {
-            const std::string name = XML::getProperty(homunculusNode, "name", "");
+            const std::string name = XML::getProperty(
+                homunculusNode, "name", "");
             if (!name.empty())
                 loadXmlFile(name);
             continue;
@@ -95,7 +94,8 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
             currentInfo = new BeingInfo;
 
         currentInfo->setBlockType(BlockType::MONSTER);
-        BeingCommon::readBasicAttributes(currentInfo, homunculusNode, "attack");
+        BeingCommon::readBasicAttributes(currentInfo,
+            homunculusNode, "attack");
 
         currentInfo->setMaxHP(XML::getProperty(homunculusNode, "maxHP", 0));
 
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index b50fc3944..f4e4116ac 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -35,7 +35,6 @@
 
 #include "resources/db/itemdbstat.h"
 
-#include "net/net.h"
 #include "net/serverfeatures.h"
 
 #include "utils/delete2.h"
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index 432b64006..f1fb26a64 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -26,12 +26,10 @@
 
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
-#include "resources/spritereference.h"
 
 #include "resources/map/blockmask.h"
 
 #include "utils/dtor.h"
-#include "utils/gettext.h"
 
 #include "configuration.h"
 
@@ -76,7 +74,8 @@ void MercenaryDB::loadXmlFile(const std::string &fileName)
     {
         if (xmlNameEqual(mercenaryNode, "include"))
         {
-            const std::string name = XML::getProperty(mercenaryNode, "name", "");
+            const std::string name = XML::getProperty(
+                mercenaryNode, "name", "");
             if (!name.empty())
                 loadXmlFile(name);
             continue;
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 1cbfe66c5..1021804a5 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -26,7 +26,6 @@
 
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
-#include "resources/spritereference.h"
 
 #include "resources/map/blockmask.h"
 
-- 
cgit v1.2.3-60-g2f50