[Scummvm-cvs-logs] SF.net SVN: scummvm:[52296] scummvm/trunk/common/config-manager.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Aug 23 12:00:40 CEST 2010


Revision: 52296
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52296&view=rev
Author:   fingolfin
Date:     2010-08-23 10:00:40 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
CONFIG: Always sort 'scummvm' and keymapper domains first

Modified Paths:
--------------
    scummvm/trunk/common/config-manager.cpp

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2010-08-23 10:00:19 UTC (rev 52295)
+++ scummvm/trunk/common/config-manager.cpp	2010-08-23 10:00:40 UTC (rev 52296)
@@ -219,32 +219,27 @@
 		stream = dump;
 	}
 
+	// Write the application domain
+	writeDomain(*stream, kApplicationDomain, _appDomain);
+
+#ifdef ENABLE_KEYMAPPER
+	// Write the keymapper domain
+	writeDomain(*stream, kKeymapperDomain, _keymapperDomain);
+#endif
+
 	// First write the domains in _domainSaveOrder, in that order.
 	// Note: It's possible for _domainSaveOrder to list domains which
-	// are not present anymore.
+	// are not present anymore, so we validate each name.
 	Array<String>::const_iterator i;
 	for (i = _domainSaveOrder.begin(); i != _domainSaveOrder.end(); ++i) {
-		if (kApplicationDomain == *i) {
-			writeDomain(*stream, *i, _appDomain);
-#ifdef ENABLE_KEYMAPPER
-		} else if (kKeymapperDomain == *i) {
-			writeDomain(*stream, *i, _keymapperDomain);
-#endif
-		} else if (_gameDomains.contains(*i)) {
+		if (_gameDomains.contains(*i)) {
 			writeDomain(*stream, *i, _gameDomains[*i]);
 		}
 	}
 
 	DomainMap::const_iterator d;
 
-
 	// Now write the domains which haven't been written yet
-	if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), kApplicationDomain) == _domainSaveOrder.end())
-		writeDomain(*stream, kApplicationDomain, _appDomain);
-#ifdef ENABLE_KEYMAPPER
-	if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), kKeymapperDomain) == _domainSaveOrder.end())
-		writeDomain(*stream, kKeymapperDomain, _keymapperDomain);
-#endif
 	for (d = _gameDomains.begin(); d != _gameDomains.end(); ++d) {
 		if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), d->_key) == _domainSaveOrder.end())
 			writeDomain(*stream, d->_key, d->_value);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list