aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-11-21 03:50:15 +0000
committerMax Horn2002-11-21 03:50:15 +0000
commitd76627abac9869a979f06deea9fc0a46dfb5dc5c (patch)
tree5e466dc10e48f23677e5fbabd2e1529634353560
parent013cc42e8d182db5daa3907cc93c29c1886a112b (diff)
downloadscummvm-rg350-d76627abac9869a979f06deea9fc0a46dfb5dc5c.tar.gz
scummvm-rg350-d76627abac9869a979f06deea9fc0a46dfb5dc5c.tar.bz2
scummvm-rg350-d76627abac9869a979f06deea9fc0a46dfb5dc5c.zip
consistently ignore case of the domain name
svn-id: r5650
-rw-r--r--common/config-file.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/common/config-file.cpp b/common/config-file.cpp
index c6289e45cf..ccdbb8f75c 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -112,6 +112,7 @@ const char *Config::get(const String &key, const String &d) const
else
domain = d;
+ domain.toLowercase();
if (domains.contains(domain) && domains[domain].contains(key))
return domains[domain][key].c_str();
@@ -145,6 +146,7 @@ void Config::set(const String &key, const String &value, const String &d)
else
domain = d;
+ domain.toLowercase();
domains[domain][key] = value;
}
@@ -203,21 +205,27 @@ void Config::flush() const
void Config::rename_domain(const String &d)
{
- if (d == defaultDomain)
+ String domain(d);
+ domain.toLowercase();
+
+ if (domain == defaultDomain)
return;
StringMap &oldHash = domains[defaultDomain];
- StringMap &newHash = domains[d];
+ StringMap &newHash = domains[domain];
newHash.merge(oldHash);
domains.remove(defaultDomain);
- defaultDomain = d;
+ defaultDomain = domain;
}
void Config::delete_domain(const String &d)
{
+ String domain(d);
+ domain.toLowercase();
+
domains.remove(d);
}