aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2006-04-01 22:31:45 +0000
committerMax Horn2006-04-01 22:31:45 +0000
commit8b1c432bac1dc6efde4a86f7f3d4a51f2ae3e713 (patch)
treec50f68247715dadfcd6debb7ab2e4d5f25da1639 /common
parentc4955466fd27eef92c551f630cdef5c51dce1e74 (diff)
downloadscummvm-rg350-8b1c432bac1dc6efde4a86f7f3d4a51f2ae3e713.tar.gz
scummvm-rg350-8b1c432bac1dc6efde4a86f7f3d4a51f2ae3e713.tar.bz2
scummvm-rg350-8b1c432bac1dc6efde4a86f7f3d4a51f2ae3e713.zip
Switch ConfigManager to use HashMap (seems to work fine over here, but an older version killed my scummvm.ini, so use at your own risk (not that you really have a choice. I just like being evil *g*))
svn-id: r21539
Diffstat (limited to 'common')
-rw-r--r--common/config-file.h4
-rw-r--r--common/config-manager.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/common/config-file.h b/common/config-file.h
index 57501b5c73..59f2b5c2f9 100644
--- a/common/config-file.h
+++ b/common/config-file.h
@@ -51,8 +51,8 @@ namespace Common {
*/
class ConfigFile {
public:
- typedef Map<String, bool, IgnoreCase_Less> StringSet;
- //typedef HashMap<String, bool, IgnoreCase_Hash, IgnoreCase_EqualTo> StringSet;
+ //typedef Map<String, bool, IgnoreCase_Less> StringSet;
+ typedef HashMap<String, bool, IgnoreCase_Hash, IgnoreCase_EqualTo> StringSet;
struct KeyValue {
String key;
diff --git a/common/config-manager.h b/common/config-manager.h
index 452b95d3c6..eb06f7493d 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -45,8 +45,8 @@ struct IgnoreCase_Hash {
uint operator()(const String& x) const { return hashit_lower(x.c_str()); }
};
-typedef Map<String, String, IgnoreCase_Less> StringMap;
-//typedef HashMap<String, String, IgnoreCase_Hash, IgnoreCase_EqualTo> StringMap;
+//typedef Map<String, String, IgnoreCase_Less> StringMap;
+typedef HashMap<String, String, IgnoreCase_Hash, IgnoreCase_EqualTo> StringMap;
/**
* The (singleton) configuration manager, used to query & set configuration
@@ -76,8 +76,8 @@ public:
bool hasKVComment(const String &key) const;
};
- typedef Map<String, Domain, IgnoreCase_Less> DomainMap;
- //typedef HashMap<String, Domain, IgnoreCase_Hash, IgnoreCase_EqualTo> DomainMap;
+ //typedef Map<String, Domain, IgnoreCase_Less> DomainMap;
+ typedef HashMap<String, Domain, IgnoreCase_Hash, IgnoreCase_EqualTo> DomainMap;
#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
/** The name of the application domain (normally 'scummvm'). */