[Scummvm-cvs-logs] CVS: scummvm/common config-file.h,1.6,1.7 config-file.cpp,1.10,1.11 gameDetector.cpp,1.37,1.38

[Max Horn]

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

Modified Files:
	config-file.h config-file.cpp gameDetector.cpp 
Log Message:
enhanced Config::rename_domain; added the ability to change the domain name in EditGameDialog

Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config-file.h	13 Nov 2002 20:23:24 -0000	1.6
+++ config-file.h	21 Nov 2002 17:25:31 -0000	1.7
@@ -46,7 +46,7 @@
 
 	void set_domain(const String &d);
 	void flush() const;
-	void rename_domain(const String &d);
+	void rename_domain(const String &oldD, const String &newD);
 	void delete_domain(const String &d);
 	bool has_domain(const String &d) const;
 	void set_filename(const String &);

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config-file.cpp	21 Nov 2002 16:55:52 -0000	1.10
+++ config-file.cpp	21 Nov 2002 17:25:31 -0000	1.11
@@ -201,22 +201,22 @@
 	}
 }
 
-void Config::rename_domain(const String &d)
+void Config::rename_domain(const String &oldD, const String &newD)
 {
-	String domain(d);
-	domain.toLowercase();
+	String oldDomain(oldD);
+	String newDomain(newD);
+	oldDomain.toLowercase();
+	newDomain.toLowercase();
 
-	if (domain == defaultDomain)
+	if (oldDomain == newDomain)
 		return;
 
-	StringMap &oldHash = domains[defaultDomain];
-	StringMap &newHash = domains[domain];
+	StringMap &oldHash = domains[oldDomain];
+	StringMap &newHash = domains[newDomain];
 
 	newHash.merge(oldHash);
 	
-	domains.remove(defaultDomain);
-	
-	defaultDomain = domain;
+	domains.remove(oldDomain);
 }
 
 void Config::delete_domain(const String &d)

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gameDetector.cpp	21 Nov 2002 13:36:26 -0000	1.37
+++ gameDetector.cpp	21 Nov 2002 17:25:31 -0000	1.38
@@ -360,8 +360,8 @@
 {
 	_gameFileName = name;
 	g_config->set_domain(name);
-	g_config->rename_domain("game-specific");
-	g_config->rename_domain(name);
+	g_config->rename_domain(name, "game-specific");
+	g_config->rename_domain("game-specific", name);
 	updateconfig();
 }