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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/utils/xml.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index a2de26ee3..94fc18f98 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -140,7 +140,9 @@ namespace XML return mDoc ? xmlDocGetRootElement(mDoc) : nullptr; } - int getProperty(const XmlNodePtr node, const char *const name, int def) + int getProperty(const XmlNodePtr node, + const char *const name, + int def) { int &ret = def; @@ -154,8 +156,11 @@ namespace XML return ret; } - int getIntProperty(const XmlNodePtr node, const char *const name, int def, - const int min, const int max) + int getIntProperty(const XmlNodePtr node, + const char *const name, + int def, + const int min, + const int max) { int &ret = def; @@ -172,7 +177,8 @@ namespace XML return ret; } - double getFloatProperty(const XmlNodePtr node, const char *const name, + double getFloatProperty(const XmlNodePtr node, + const char *const name, double def) { double &ret = def; @@ -187,7 +193,8 @@ namespace XML return ret; } - std::string getProperty(const XmlNodePtr node, const char *const name, + std::string getProperty(const XmlNodePtr node, + const char *const name, const std::string &def) { xmlChar *const prop = XmlGetProp(node, name); @@ -201,7 +208,8 @@ namespace XML return def; } - std::string langProperty(const XmlNodePtr node, const char *const name, + std::string langProperty(const XmlNodePtr node, + const char *const name, const std::string &def) { std::string str = getProperty(node, name, def); @@ -211,7 +219,8 @@ namespace XML return translator->getStr(str); } - bool getBoolProperty(const XmlNodePtr node, const char *const name, + bool getBoolProperty(const XmlNodePtr node, + const char *const name, const bool def) { const xmlChar *const prop = XmlGetProp(node, name); |