Add xml loader. For now unused.

6 files changed, 110 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b0a0c3b2..56209c3c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -748,6 +748,8 @@ SET(SRCS
     resources/loaders/subimagesetloader.h
     resources/loaders/walklayerloader.cpp
     resources/loaders/walklayerloader.h
+    resources/loaders/xmlloader.cpp
+    resources/loaders/xmlloader.h
     resources/resourcemanager/resourcemanager.cpp
     resources/resourcemanager/resourcemanager.h
     resources/safeopenglimagehelper.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 67b62dfd4..db7750854 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -419,6 +419,8 @@ SRC += events/actionevent.h \
 	      resources/loaders/subimagesetloader.h \
 	      resources/loaders/walklayerloader.cpp \
 	      resources/loaders/walklayerloader.h \
+	      resources/loaders/xmlloader.cpp \
+	      resources/loaders/xmlloader.h \
 	      resources/resourcemanager/resourcemanager.cpp \
 	      resources/resourcemanager/resourcemanager.h \
 	      resources/safeopenglimagehelper.cpp \
diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp
new file mode 100644
index 000000000..b834c8788
--- /dev/null
+++ b/src/resources/loaders/xmlloader.cpp
@@ -0,0 +1,64 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/resourcemanager/resourcemanager.h"
+
+#include "utils/checkutils.h"
+#include "utils/physfsrwops.h"
+
+#include "resources/loaders/xmlloader.h"
+
+#include "debug.h"
+
+namespace
+{
+    struct ResourceLoader final
+    {
+        std::string path;
+
+        static Resource *load(const void *const v)
+        {
+            if (!v)
+                return nullptr;
+            const ResourceLoader *const
+                rl = static_cast<const ResourceLoader *const>(v);
+            SDL_RWops *const rw = MPHYSFSRWOPS_openRead(rl->path.c_str());
+            if (!rw)
+            {
+                reportAlways("Error loading resource: %s",
+                    rl->path.c_str());
+                return nullptr;
+            }
+            Resource *const res = nullptr;
+            return res;
+        }
+    };
+
+}  // namespace
+
+XML::Document *Loader::getXml(const std::string &idPath)
+{
+    ResourceLoader rl = { idPath};
+    return static_cast<XML::Document*>(resourceManager->get(
+        idPath, ResourceLoader::load, &rl));
+}
+
diff --git a/src/resources/loaders/xmlloader.h b/src/resources/loaders/xmlloader.h
new file mode 100644
index 000000000..d898a0092
--- /dev/null
+++ b/src/resources/loaders/xmlloader.h
@@ -0,0 +1,36 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_RESOURCEMANAGER_XMLLOADER_H
+#define RESOURCES_RESOURCEMANAGER_XMLLOADER_H
+
+#include "utils/xml.h"
+
+#include "localconsts.h"
+
+namespace Loader
+{
+    XML::Document *getXml(const std::string &idPath) A_WARN_UNUSED;
+
+}  // namespace Loader
+
+#endif  // RESOURCES_RESOURCEMANAGER_XMLLOADER_H
diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h
index ca8c99639..1e03023ac 100644
--- a/src/utils/xml/libxml.h
+++ b/src/utils/xml/libxml.h
@@ -32,6 +32,8 @@
 
 #include "utils/xml/libxml.inc"
 
+#include "resources/resource.h"
+
 #ifndef _GLIBCXX_STRING
 #include <string>
 #endif  // _GLIBCXX_STRING
@@ -47,7 +49,7 @@ namespace XML
      * A helper class for parsing an XML document, which also cleans it up
      * again (RAII).
      */
-    class Document final
+    class Document final : public Resource
     {
         public:
             /**
diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h
index ef7b3e798..0f2d049e6 100644
--- a/src/utils/xml/pugixml.h
+++ b/src/utils/xml/pugixml.h
@@ -32,6 +32,8 @@
 
 #include "utils/xml/pugixml.inc"
 
+#include "resources/resource.h"
+
 #include <pugixml.hpp>
 
 #include <string>
@@ -47,7 +49,7 @@ namespace XML
      * A helper class for parsing an XML document, which also cleans it up
      * again (RAII).
      */
-    class Document final
+    class Document final : public Resource
     {
         public:
             /**