[Scummvm-cvs-logs] SF.net SVN: scummvm: [21539] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 21539
Author:   fingolfin
Date:     2006-04-01 14:31:45 -0800 (Sat, 01 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21539&view=rev

Log Message:
-----------
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*))

Modified Paths:
--------------
    scummvm/trunk/common/config-file.h
    scummvm/trunk/common/config-manager.h
Modified: scummvm/trunk/common/config-file.h
===================================================================
--- scummvm/trunk/common/config-file.h	2006-04-01 21:56:10 UTC (rev 21538)
+++ scummvm/trunk/common/config-file.h	2006-04-01 22:31:45 UTC (rev 21539)
@@ -51,8 +51,8 @@
  */
 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;

Modified: scummvm/trunk/common/config-manager.h
===================================================================
--- scummvm/trunk/common/config-manager.h	2006-04-01 21:56:10 UTC (rev 21538)
+++ scummvm/trunk/common/config-manager.h	2006-04-01 22:31:45 UTC (rev 21539)
@@ -45,8 +45,8 @@
   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 @@
 		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'). */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.