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/configuration.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/configuration.cpp')
| -rw-r--r-- | src/configuration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index cb7adf8f1..ca4542155 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -666,7 +666,7 @@ bool Configuration::resetBoolValue(const std::string &key) } -void ConfigurationObject::initFromXML(const XmlNodePtr parent_node) +void ConfigurationObject::initFromXML(const XmlNodePtrConst parent_node) { clear(); @@ -729,7 +729,7 @@ void Configuration::init(const std::string &filename, const bool useResManager) return; } - const XmlNodePtr rootNode = doc.rootNode(); + const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "configuration")) { @@ -749,7 +749,7 @@ void Configuration::reInit() return; } - const XmlNodePtr rootNode = doc.rootNode(); + const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "configuration")) { |