From 23a0f5318c50cdf3dce19e4de0c98fb5ae1c2618 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 7 Aug 2011 11:39:54 +0200 Subject: JANITORIAL: Remove trailing empty lines. --- common/config-manager.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'common/config-manager.cpp') diff --git a/common/config-manager.cpp b/common/config-manager.cpp index fbdb611f3c..1064ecf43c 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -696,4 +696,3 @@ bool ConfigManager::Domain::hasKVComment(const String &key) const { } } // End of namespace Common - -- cgit v1.2.3 From 84220d2ca05707f22a0242b1745caf0b657237a3 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sat, 6 Aug 2011 09:47:19 +0200 Subject: COMMON: Remove superfluous Common:: qualifiers. --- common/config-manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/config-manager.cpp') diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 1064ecf43c..874aee136f 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -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", -- cgit v1.2.3 From c6d5d748353c848e134517214217912447d7a567 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sat, 6 Aug 2011 10:01:34 +0200 Subject: COMMON: Make constants actually const. --- common/config-manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/config-manager.cpp') diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 874aee136f..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 - -- cgit v1.2.3