diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /common/config-manager.cpp | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'common/config-manager.cpp')
| -rw-r--r-- | common/config-manager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index fbdb611f3c..c62dee8bea 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -38,11 +38,11 @@ namespace Common { DECLARE_SINGLETON(ConfigManager); -const char *ConfigManager::kApplicationDomain = "scummvm"; -const char *ConfigManager::kTransientDomain = "__TRANSIENT"; +char const *const ConfigManager::kApplicationDomain = "scummvm"; +char const *const ConfigManager::kTransientDomain = "__TRANSIENT"; #ifdef ENABLE_KEYMAPPER -const char *ConfigManager::kKeymapperDomain = "keymapper"; +char const *const ConfigManager::kKeymapperDomain = "keymapper"; #endif #pragma mark - @@ -112,7 +112,7 @@ void ConfigManager::loadConfigFile(const String &filename) { * Add a ready-made domain based on its name and contents * The domain name should not already exist in the ConfigManager. **/ -void ConfigManager::addDomain(const Common::String &domainName, const ConfigManager::Domain &domain) { +void ConfigManager::addDomain(const String &domainName, const ConfigManager::Domain &domain) { if (domainName.empty()) return; if (domainName == kApplicationDomain) { @@ -492,7 +492,7 @@ int ConfigManager::getInt(const String &key, const String &domName) const { bool ConfigManager::getBool(const String &key, const String &domName) const { String value(get(key, domName)); bool val; - if (Common::parseBool(value, val)) + if (parseBool(value, val)) return val; error("ConfigManager::getBool(%s,%s): '%s' is not a valid bool", @@ -696,4 +696,3 @@ bool ConfigManager::Domain::hasKVComment(const String &key) const { } } // End of namespace Common - |