summaryrefslogtreecommitdiff
path: root/src/configuration.cpp
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/configuration.cpp
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/configuration.cpp')
-rw-r--r--src/configuration.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index fcc6bfbdf..583ea2d83 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -706,7 +706,7 @@ void ConfigurationObject::initFromXML(const XmlNodePtrConst parentNode)
for_each_xml_child_node(subnode, node)
{
if (xmlNameEqual(subnode, name.c_str()) &&
- subnode->type == XML_ELEMENT_NODE)
+ xmlTypeEqual(subnode, XML_ELEMENT_NODE))
{
ConfigurationObject *const cobj = new ConfigurationObject;
cobj->initFromXML(subnode); // recurse
@@ -855,7 +855,7 @@ void Configuration::write()
fclose(testFile);
}
- const XmlTextWriterPtr writer = xmlNewTextWriterFilename(
+ const XmlTextWriterPtr writer = XmlNewTextWriterFilename(
mConfigPath.c_str(), 0);
if (!writer)
@@ -867,15 +867,15 @@ void Configuration::write()
logger->log1("Configuration::write() writing configuration...");
- xmlTextWriterSetIndent(writer, 1);
- xmlTextWriterStartDocument(writer, nullptr, nullptr, nullptr);
+ XmlTextWriterSetIndent(writer, 1);
+ XmlTextWriterStartDocument(writer, nullptr, nullptr, nullptr);
// xmlTextWriterStartDocument(writer, nullptr, "utf8", nullptr);
XmlTextWriterStartElement(writer, "configuration");
writeToXML(writer);
- xmlTextWriterEndDocument(writer);
- xmlFreeTextWriter(writer);
+ XmlTextWriterEndDocument(writer);
+ XmlFreeTextWriter(writer);
BLOCK_END("Configuration::write")
}