diff options
| author | Chris Apers | 2005-09-03 16:08:27 +0000 |
|---|---|---|
| committer | Chris Apers | 2005-09-03 16:08:27 +0000 |
| commit | 09b0f765d4a3b4d726d440182fb4e7fdcb5d805f (patch) | |
| tree | 9f22f192e174d905814f8806595e73a41306272c /common | |
| parent | f7fb3bf7a8cb0dd5c4c892d1c911e3a1fe9996fa (diff) | |
| download | scummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.tar.gz scummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.tar.bz2 scummvm-rg350-09b0f765d4a3b4d726d440182fb4e7fdcb5d805f.zip | |
Change PalmOS ident and fix ARM bug using global initializers
svn-id: r18744
Diffstat (limited to 'common')
| -rw-r--r-- | common/config-manager.cpp | 14 | ||||
| -rw-r--r-- | common/config-manager.h | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 49bc3f062c..9302b6d680 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -62,12 +62,23 @@ static bool isValidDomainName(const Common::String &domain) { 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 @@ void ConfigManager::loadDefaultConfigFile() { #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 @@ void ConfigManager::loadDefaultConfigFile() { strcpy(configFile, DEFAULT_CONFIG_FILE); #endif #endif - loadConfigFile(configFile); } diff --git a/common/config-manager.h b/common/config-manager.h index 71ea453add..df91781e19 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -67,11 +67,16 @@ public: 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); |