diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:42:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:42:15 +0300 |
| commit | bb4b31241a30c16eba2506fff89b4057e4a7c6ee (patch) | |
| tree | e2a7e155523ceb500a63f91aba2af66bd8cf8081 | |
| parent | 5edddb1313ed0dc275e6ae70b8a1780ded3a590d (diff) | |
| download | manaplus-bb4b31241a30c16eba2506fff89b4057e4a7c6ee.tar.gz manaplus-bb4b31241a30c16eba2506fff89b4057e4a7c6ee.tar.bz2 manaplus-bb4b31241a30c16eba2506fff89b4057e4a7c6ee.tar.xz manaplus-bb4b31241a30c16eba2506fff89b4057e4a7c6ee.zip | |
Replace xmlTextWriterPtr to XmlTextWriterPtr
| -rw-r--r-- | src/configuration.cpp | 4 | ||||
| -rw-r--r-- | src/configuration.h | 2 | ||||
| -rw-r--r-- | src/utils/xml.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index b3d5d77d0..39e0c75d4 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -500,7 +500,7 @@ void Configuration::init(const std::string &filename, bool useResManager) initFromXML(rootNode); } -void ConfigurationObject::writeToXML(xmlTextWriterPtr writer) +void ConfigurationObject::writeToXML(XmlTextWriterPtr writer) { for (Options::const_iterator i = mOptions.begin(), i_end = mOptions.end(); i != i_end; ++i) @@ -551,7 +551,7 @@ void Configuration::write() fclose(testFile); } - xmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); + XmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); if (!writer) { diff --git a/src/configuration.h b/src/configuration.h index 55e588964..2a84588f6 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -194,7 +194,7 @@ class ConfigurationObject protected: virtual void initFromXML(XmlNodePtr node); - virtual void writeToXML(xmlTextWriterPtr writer); + virtual void writeToXML(XmlTextWriterPtr writer); void deleteList(const std::string &name); diff --git a/src/utils/xml.h b/src/utils/xml.h index 821ee2de4..f623fa618 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -30,8 +30,8 @@ #include <string> #define XmlNodePtr xmlNodePtr - #define xmlNameEqual(node, str) xmlStrEqual((node)->name, BAD_CAST (str)) +#define XmlTextWriterPtr xmlTextWriterPtr /** * XML helper functions. |