Fix code style.

20 files changed, 1 insertions, 28 deletions

diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 67aeea4fb..d9b65bb02 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -25,14 +25,10 @@
 
 #include "enums/resources/map/blockmask.h"
 
-#include "utils/files.h"
-
 #include "resources/beinginfo.h"
 
 #include "resources/sprite/spritereference.h"
 
-#include <algorithm>
-
 #include "debug.h"
 
 void BeingCommon::readBasicAttributes(BeingInfo *const info,
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index 04551092f..267ecaf2a 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -21,6 +21,7 @@
 #ifndef RESOURCES_BEINGCOMMON_H
 #define RESOURCES_BEINGCOMMON_H
 
+#include "utils/files.h"
 #include "utils/xml.h"
 
 #include "utils/stringvector.h"
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp
index d11e8ab63..5b377b173 100644
--- a/src/resources/db/avatardb.cpp
+++ b/src/resources/db/avatardb.cpp
@@ -30,7 +30,6 @@
 #include "resources/sprite/spritereference.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "configuration.h"
diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp
index de8f48499..1aa6167e2 100644
--- a/src/resources/db/badgesdb.cpp
+++ b/src/resources/db/badgesdb.cpp
@@ -22,8 +22,6 @@
 
 #include "configuration.h"
 
-#include "resources/beingcommon.h"
-
 #include "utils/files.h"
 #include "utils/xmlutils.h"
 
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp
index daf347473..335627c53 100644
--- a/src/resources/db/commandsdb.cpp
+++ b/src/resources/db/commandsdb.cpp
@@ -28,8 +28,6 @@
 
 #include "resources/beingcommon.h"
 
-#include "utils/files.h"
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp
index ce77aa6b4..a2a6a6494 100644
--- a/src/resources/db/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -23,7 +23,6 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "utils/files.h"
 #include "utils/translation/podict.h"
 
 #include "resources/beingcommon.h"
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 32679a9dc..b2f9a0581 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -32,8 +32,6 @@
 
 #include "resources/sprite/animatedsprite.h"
 
-#include "utils/files.h"
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 6f8164742..e8d2f723e 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -28,7 +28,6 @@
 #include "resources/beinginfo.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 
 #include "configuration.h"
 
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 99139fb21..27987c657 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -28,7 +28,6 @@
 #include "resources/horseinfo.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 
 #include "debug.h"
 
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 620367bd1..ba5631293 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -29,7 +29,6 @@
 
 #include "enums/resources/spritedirection.h"
 
-#include "resources/beingcommon.h"
 #include "resources/iteminfo.h"
 #include "resources/itemtypemapdata.h"
 
diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp
index 521d7ac84..6d31c69f2 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -26,8 +26,6 @@
 
 #include "resources/beingcommon.h"
 
-#include "utils/files.h"
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index bc5374f51..26476892d 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -28,7 +28,6 @@
 #include "resources/beinginfo.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 
 #include "configuration.h"
 
diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp
index 051fe09e5..3a803a9af 100644
--- a/src/resources/db/moddb.cpp
+++ b/src/resources/db/moddb.cpp
@@ -28,7 +28,6 @@
 #include "resources/beingcommon.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 1c18ada0b..133b2545d 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -28,7 +28,6 @@
 #include "resources/beinginfo.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "configuration.h"
diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp
index dff7b4c70..1827cd859 100644
--- a/src/resources/db/npcdb.cpp
+++ b/src/resources/db/npcdb.cpp
@@ -31,7 +31,6 @@
 #include "resources/sprite/spritereference.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 610925864..772a64a45 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -27,7 +27,6 @@
 #include "resources/npcdialoginfo.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 
 #include "debug.h"
 
diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp
index 17ffba502..c2f6508c3 100644
--- a/src/resources/db/petdb.cpp
+++ b/src/resources/db/petdb.cpp
@@ -31,7 +31,6 @@
 #include "resources/sprite/spritereference.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp
index 6ffcfbe18..c59f6f616 100644
--- a/src/resources/db/skillunitdb.cpp
+++ b/src/resources/db/skillunitdb.cpp
@@ -31,7 +31,6 @@
 #include "resources/sprite/spritereference.h"
 
 #include "utils/dtor.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp
index 955a20d1f..238e17b51 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -27,8 +27,6 @@
 
 #include "resources/beingcommon.h"
 
-#include "utils/files.h"
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index f55551982..780156910 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -50,7 +50,6 @@
 
 #include "utils/base64.h"
 #include "utils/delete2.h"
-#include "utils/files.h"
 #include "utils/stringmap.h"
 
 #include <zlib.h>
@@ -745,7 +744,6 @@ bool MapReader::readCsvLayer(const XmlNodePtrConst childNode,
 
         oldPos = pos + 1;
     }
-    //XmlFree(const_cast<char*>(xmlChars));
     return true;
 }