summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-30 13:59:45 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-20 21:58:39 +0300
commitbc3a7cf853510ffe1e42dc683f854d360f6528c7 (patch)
tree9898f13eafc3e1a20388d8d592bfcc05c8f50ba7 /src/gui
parenta058af57bddd4a4394401cc75d33461e17aab8c1 (diff)
downloadmanaplus-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.gz
manaplus-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.bz2
manaplus-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.xz
manaplus-bc3a7cf853510ffe1e42dc683f854d360f6528c7.zip
Add pugixml backend incomplete.
Add some defines for xml nodes manipulation. With pugixml backend no xml writing.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp6
-rw-r--r--src/gui/windows/questswindow.cpp2
-rw-r--r--src/gui/windows/serverdialog.cpp20
3 files changed, 11 insertions, 17 deletions
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));
}
}