[Scummvm-cvs-logs] CVS: scummvm/common config-file.cpp,1.8,1.9

Max Horn fingolfin at users.sourceforge.net
Wed Nov 20 19:51:01 CET 2002


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv19214

Modified Files:
	config-file.cpp 
Log Message:
consistently ignore case of the domain name

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config-file.cpp	13 Nov 2002 20:23:24 -0000	1.8
+++ config-file.cpp	21 Nov 2002 03:50:15 -0000	1.9
@@ -112,6 +112,7 @@
 	else
 		domain = d;
 
+	domain.toLowercase();
 	if (domains.contains(domain) && domains[domain].contains(key))
 		return domains[domain][key].c_str();
 
@@ -145,6 +146,7 @@
 	else
 		domain = d;
 
+	domain.toLowercase();
 	domains[domain][key] = value;
 }
 
@@ -203,21 +205,27 @@
 
 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);
 }
 





More information about the Scummvm-git-logs mailing list