diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/config-manager.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/config-manager.h')
| -rw-r--r-- | common/config-manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/config-manager.h b/common/config-manager.h index 78a62b9808..02d4ec3438 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -64,14 +64,14 @@ public: typedef HashMap<String, Domain, IgnoreCase_Hash, IgnoreCase_EqualTo> DomainMap; /** The name of the application domain (normally 'scummvm'). */ - static const char *kApplicationDomain; + static char const *const kApplicationDomain; /** The transient (pseudo) domain. */ - static const char *kTransientDomain; + static char const *const kTransientDomain; #ifdef ENABLE_KEYMAPPER /** The name of keymapper domain used to store the key maps */ - static const char *kKeymapperDomain; + static char const *const kKeymapperDomain; #endif void loadDefaultConfigFile(); @@ -153,7 +153,7 @@ private: ConfigManager(); void loadFromStream(SeekableReadStream &stream); - void addDomain(const Common::String &domainName, const Domain &domain); + void addDomain(const String &domainName, const Domain &domain); void writeDomain(WriteStream &stream, const String &name, const Domain &domain); void renameDomain(const String &oldName, const String &newName, DomainMap &map); |