[Scummvm-cvs-logs] CVS: scummvm/common config-manager.h,1.18,1.19 config-manager.cpp,1.26,1.27

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18688/common

Modified Files:
	config-manager.h config-manager.cpp 
Log Message:
Make loading the config file explicit

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- config-manager.h	28 Sep 2004 12:10:48 -0000	1.18
+++ config-manager.h	25 Dec 2004 19:03:13 -0000	1.19
@@ -74,7 +74,8 @@
 	/** The transient (pseudo) domain. */
 	static const String kTransientDomain;
 
-	void				switchFile(const String &filename);
+	void				loadDefaultConfigFile();
+	void				loadConfigFile(const String &filename);
 
 	bool				hasKey(const String &key) const;
 	bool				hasKey(const String &key, const String &dom) const;

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- config-manager.cpp	20 Dec 2004 23:58:40 -0000	1.26
+++ config-manager.cpp	25 Dec 2004 19:03:13 -0000	1.27
@@ -62,7 +62,12 @@
 
 
 ConfigManager::ConfigManager() {
+	// Ensure the global domain(s) are setup.
+	_globalDomains.addKey(kApplicationDomain);
+}
 
+
+void ConfigManager::loadDefaultConfigFile() {
 	char configFile[MAXPATHLEN];
 #if defined(UNIX)
 	if(getenv("HOME") != NULL)
@@ -80,10 +85,10 @@
 	#endif
 #endif
 
-	switchFile(configFile);
+	loadConfigFile(configFile);
 }
 
-void ConfigManager::switchFile(const String &filename) {
+void ConfigManager::loadConfigFile(const String &filename) {
 	_globalDomains.clear();
 	_gameDomains.clear();
 	_transientDomain.clear();