diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-18 20:02:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-18 20:02:27 +0300 |
| commit | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (patch) | |
| tree | afe2c0d8cf75738fd847af37dc166e0c338f7493 /src/utils/xml.h | |
| parent | 8a5603e487f682f5f67bc2cedae81249aa138f5b (diff) | |
| parent | e9e343366fbfbe9a6343089ff113354524f3f306 (diff) | |
| download | plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.gz plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.bz2 plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.xz plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/utils/xml.h')
| -rw-r--r-- | src/utils/xml.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/utils/xml.h b/src/utils/xml.h index 0fa0ba078..5c1fb7605 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -31,6 +31,7 @@ #include "localconsts.h" #define XmlNodePtr xmlNodePtr +#define XmlNodePtrConst xmlNode *const #define XmlStrEqual(str1, str2) xmlStrEqual(str1, \ reinterpret_cast<const xmlChar*>(str2)) #define xmlNameEqual(node, str) xmlStrEqual((node)->name, \ @@ -96,37 +97,45 @@ namespace XML /** * Gets an floating point property from an XmlNodePtr. */ - double getFloatProperty(const XmlNodePtr node, const char *const name, + double getFloatProperty(const XmlNodePtr node, + const char *const name, double def) A_WARN_UNUSED; /** * Gets an integer property from an XmlNodePtr. */ - int getProperty(const XmlNodePtr node, const char *const name, + int getProperty(const XmlNodePtr node, + const char *const name, int def) A_WARN_UNUSED; /** * Gets an integer property from an XmlNodePtr. */ - int getIntProperty(const XmlNodePtr node, const char *const name, int def, - const int min, const int max) A_WARN_UNUSED; + int getIntProperty(const XmlNodePtr node, + const char *const name, + int def, + const int min, + const int max) A_WARN_UNUSED; /** * Gets a string property from an XmlNodePtr. */ - std::string getProperty(const XmlNodePtr node, const char *const name, + std::string getProperty(const XmlNodePtr node, + const char *const name, const std::string &def) A_WARN_UNUSED; /** * Gets a translated string property from an XmlNodePtr. */ - std::string langProperty(const XmlNodePtr node, const char *const name, + std::string langProperty(const XmlNodePtr node, + const char *const name, const std::string &def) A_WARN_UNUSED; /** * Gets a boolean property from an XmlNodePtr. */ - bool getBoolProperty(const XmlNodePtr node, const char *const name, + bool getBoolProperty(const XmlNodePtr node, + const char *const name, const bool def) A_WARN_UNUSED; /** |