[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.1,1.2

[Max Horn]

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

Modified Files:
	config-manager.cpp 
Log Message:
fix ConfMan.set when dom is empty; added some asserts (paranoia)

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config-manager.cpp	8 Oct 2003 21:59:22 -0000	1.1
+++ config-manager.cpp	9 Oct 2003 11:42:59 -0000	1.2
@@ -299,6 +299,9 @@
 }
 
 void ConfigManager::set(const String &key, const String &value, const String &dom) {
+	if (dom.isEmpty())
+		set(key, value);
+
 	if (_globalDomains.contains(dom))
 		_globalDomains[dom][key] = value;
 	else
@@ -346,24 +349,30 @@
 
 
 void ConfigManager::setActiveDomain(const String &domain) {
+	assert(!domain.isEmpty());
 	_activeDomain = domain;
 	_gameDomains.addKey(domain);
 }
 
-void ConfigManager::removeGameDomain(const String &name) {
-	_gameDomains.remove(name);
+void ConfigManager::removeGameDomain(const String &domain) {
+	assert(!domain.isEmpty());
+	_gameDomains.remove(domain);
 }
 
 void ConfigManager::renameGameDomain(const String &oldName, const String &newName) {
 	if (oldName == newName)
 		return;
 
+	assert(!oldName.isEmpty());
+	assert(!newName.isEmpty());
+
 	_gameDomains[newName].merge(_gameDomains[oldName]);
 	
 	_gameDomains.remove(oldName);
 }
 
 bool ConfigManager::hasGameDomain(const String &domain) const {
+	assert(!domain.isEmpty());
 	return _gameDomains.contains(domain);
 }