[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.39,1.40 config-manager.h,1.25,1.26

[Chris Apers]

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

Modified Files:
	config-manager.cpp config-manager.h 
Log Message:
Change PalmOS ident and fix ARM bug using global initializers

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- config-manager.cpp	16 Aug 2005 17:15:37 -0000	1.39
+++ config-manager.cpp	3 Sep 2005 16:08:27 -0000	1.40
@@ -62,12 +62,23 @@
 
 namespace Common {
 
+#ifndef PALMOS_ARM
+
 const String ConfigManager::kApplicationDomain("scummvm");
 const String ConfigManager::kTransientDomain("__TRANSIENT");
 
 const String trueStr("true");
 const String falseStr("false");
 
+#else
+
+const char *ConfigManager::kApplicationDomain = "scummvm";
+const char *ConfigManager::kTransientDomain = "__TRANSIENT";
+
+const char *trueStr = "true";
+const char *falseStr = "false";
+
+#endif
 
 #pragma mark -
 
@@ -89,7 +100,7 @@
 	#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		GetWindowsDirectory(configFile, MAXPATHLEN);
 		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
-	#elif defined(__PALM_OS__)
+	#elif defined(PALMOS_MODE)
 		strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
 	#elif defined(__PLAYSTATION2__)
 		strcpy(configFile, "mc0:ScummVM/" DEFAULT_CONFIG_FILE);
@@ -101,7 +112,6 @@
 		strcpy(configFile, DEFAULT_CONFIG_FILE);
 	#endif
 #endif
-
 	loadConfigFile(configFile);
 }
 

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- config-manager.h	30 Jul 2005 21:10:57 -0000	1.25
+++ config-manager.h	3 Sep 2005 16:08:27 -0000	1.26
@@ -67,11 +67,16 @@
 
 	typedef Map<String, Domain, IgnoreCaseComparator> DomainMap;
 
+#ifndef PALMOS_ARM
 	/** The name of the application domain (normally 'scummvm'). */
 	static const String kApplicationDomain;
 
 	/** The transient (pseudo) domain. */
 	static const String kTransientDomain;
+#else
+	static const char *kApplicationDomain;
+	static const char *kTransientDomain;
+#endif
 
 	void				loadDefaultConfigFile();
 	void				loadConfigFile(const String &filename);