From bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 10 Jan 2012 18:43:15 +0300
Subject: Move libxml2 includes to xml.h

---
 src/resources/action.h      | 2 +-
 src/resources/animation.h   | 2 +-
 src/resources/chardb.cpp    | 4 ----
 src/resources/chardb.h      | 2 +-
 src/resources/colordb.cpp   | 2 --
 src/resources/itemdb.cpp    | 4 +---
 src/resources/mapdb.cpp     | 2 --
 src/resources/mapreader.cpp | 1 -
 src/resources/mapreader.h   | 2 +-
 src/resources/spritedef.cpp | 2 --
 src/resources/spritedef.h   | 2 +-
 11 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/action.h b/src/resources/action.h
index 603135875..1e3965363 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -23,7 +23,7 @@
 #ifndef ACTION_H
 #define ACTION_H
 
-#include <libxml/tree.h>
+#include "utils/xml.h"
 
 #include <map>
 
diff --git a/src/resources/animation.h b/src/resources/animation.h
index f52234abb..33bfd76e9 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -23,7 +23,7 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
-#include <libxml/tree.h>
+#include "utils/xml.h"
 
 #include <vector>
 #include <string>
diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp
index c6de2e189..30408c239 100644
--- a/src/resources/chardb.cpp
+++ b/src/resources/chardb.cpp
@@ -24,10 +24,6 @@
 #include "client.h"
 #include "logger.h"
 
-#include "utils/xml.h"
-
-#include <libxml/tree.h>
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index 8be2c34c4..c668c1a73 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -25,7 +25,7 @@
 #include <map>
 #include <string>
 
-#include <libxml/tree.h>
+#include "utils/xml.h"
 
 /**
  * Char information database.
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 41393541f..2a79f0554 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -26,8 +26,6 @@
 
 #include "utils/xml.h"
 
-#include <libxml/tree.h>
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index e7cc0f931..2c381286a 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -23,6 +23,7 @@
 #include "resources/itemdb.h"
 
 #include "client.h"
+#include "configuration.h"
 #include "logger.h"
 
 #include "resources/iteminfo.h"
@@ -32,9 +33,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
-#include "configuration.h"
-
-#include <libxml/tree.h>
 
 #include "debug.h"
 
diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp
index e61ee45b0..1da3dd908 100644
--- a/src/resources/mapdb.cpp
+++ b/src/resources/mapdb.cpp
@@ -27,8 +27,6 @@
 
 #include "utils/xml.h"
 
-#include <libxml/tree.h>
-
 #include "debug.h"
 
 namespace
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 5ebfe5fe3..8c8bf2f9d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -35,7 +35,6 @@
 #include "utils/base64.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <iostream>
 #include <zlib.h>
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 301b7d7ce..8fc11e70f 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -23,7 +23,7 @@
 #ifndef MAPREADER_H
 #define MAPREADER_H
 
-#include <libxml/tree.h>
+#include "utils/xml.h"
 
 #include <string>
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 1122cb2e9..40bdb64c8 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -33,8 +33,6 @@
 
 #include "configuration.h"
 
-#include "utils/xml.h"
-
 #include "debug.h"
 
 SpriteReference *SpriteReference::Empty = nullptr;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 9e756bdf7..3f656be0d 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -25,7 +25,7 @@
 
 #include "resources/resource.h"
 
-#include <libxml/tree.h>
+#include "utils/xml.h"
 
 #include <list>
 #include <map>
-- 
cgit v1.2.3-70-g09d2