From bc3a7cf853510ffe1e42dc683f854d360f6528c7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 30 Nov 2015 13:59:45 +0300
Subject: Add pugixml backend incomplete.

Add some defines for xml nodes manipulation.
With pugixml backend no xml writing.
---
 src/gui/theme.cpp                |  6 +++---
 src/gui/windows/questswindow.cpp |  2 +-
 src/gui/windows/serverdialog.cpp | 20 +++++++-------------
 3 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 8a1eea3f3..d588ecdb3 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1156,15 +1156,15 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
 
 #define readValue(name) \
         info->name = reinterpret_cast<const char*>(\
-            xmlNodeGetContent(infoNode))
+            XmlNodeGetContent(infoNode))
 
 #define readIntValue(name) \
         info->name = atoi(reinterpret_cast<const char*>(\
-            xmlNodeGetContent(infoNode)))
+            XmlNodeGetContent(infoNode)))
 
 #define readFloatValue(name) \
         info->name = static_cast<float>(atof(reinterpret_cast<const char*>(\
-            xmlNodeGetContent(infoNode))))
+            XmlNodeGetContent(infoNode))))
 
 ThemeInfo *Theme::loadInfo(const std::string &themeName)
 {
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 1c23b9400..3bea8577f 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -228,7 +228,7 @@ void QuestsWindow::loadQuest(const int var, const XmlNodePtr node)
         if (!xmlTypeEqual(dataNode, XML_ELEMENT_NODE))
             continue;
         const char *const data = reinterpret_cast<const char*>(
-            xmlNodeGetContent(dataNode));
+            XmlNodeGetContent(dataNode));
         if (!data)
             continue;
         std::string str = translator->getStr(data);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index c61b58f6d..1049085b4 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -530,7 +530,7 @@ void ServerDialog::loadServers(const bool addNew)
                     server.port = defaultPortForServerType(server.type);
                 }
             }
-            else if (!subNode->xmlChildrenNode)
+            else if (!XmlHaveChildContent(subNode))
             {
                 continue;
             }
@@ -539,34 +539,28 @@ void ServerDialog::loadServers(const bool addNew)
                 && server.description.empty()) || (!lang.empty()
                 && xmlNameEqual(subNode, description2.c_str())))
             {
-                server.description = reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content);
+                server.description = XmlChildContent(subNode);
             }
             else if (xmlNameEqual(subNode, "registerurl"))
             {
-                server.registerUrl = reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content);
+                server.registerUrl = XmlChildContent(subNode);
             }
             else if (xmlNameEqual(subNode, "onlineListUrl"))
             {
-                server.onlineListUrl = reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content);
+                server.onlineListUrl = XmlChildContent(subNode);
             }
             else if (xmlNameEqual(subNode, "support"))
             {
-                server.supportUrl = reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content);
+                server.supportUrl = XmlChildContent(subNode);
             }
             else if (xmlNameEqual(subNode, "persistentIp"))
             {
-                std::string text = reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content);
+                std::string text = XmlChildContent(subNode);
                 server.persistentIp = (text == "1" || text == "true");
             }
             else if (xmlNameEqual(subNode, "updateMirror"))
             {
-                server.updateMirrors.push_back(reinterpret_cast<const char*>(
-                    subNode->xmlChildrenNode->content));
+                server.updateMirrors.push_back(XmlChildContent(subNode));
             }
         }
 
-- 
cgit v1.2.3-70-g09d2