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

[fingolfin at users.sourceforge.net]

Revision: 32663
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32663&view=rev
Author:   fingolfin
Date:     2008-06-10 23:00:56 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
No need to specify CaseSensitiveString_Hash explicitly anymore

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/common/file.cpp
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/cine/cine.h
    scummvm/trunk/graphics/fontman.h
    scummvm/trunk/gui/eval.h

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/common/advancedDetector.cpp	2008-06-11 06:00:56 UTC (rev 32663)
@@ -268,7 +268,10 @@
 	return kNoError;
 }
 
-static void reportUnknown(StringMap &filesMD5, HashMap<String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> &filesSize) {
+typedef HashMap<String, bool> StringSet;
+typedef HashMap<String, int32> IntMap;
+
+static void reportUnknown(StringMap &filesMD5, IntMap &filesSize) {
 	// TODO: This message should be cleaned up / made more specific.
 	// For example, we should specify at least which engine triggered this.
 	//
@@ -285,11 +288,8 @@
 }
 
 static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &params, Language language, Platform platform, const Common::String extra) {
-	typedef HashMap<String, bool, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringSet;
 	StringSet filesList;
 
-	typedef StringMap StringMap;
-	typedef HashMap<String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> IntMap;
 	StringMap filesMD5;
 	IntMap filesSize;
 	IntMap allFiles;

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/common/file.cpp	2008-06-11 06:00:56 UTC (rev 32663)
@@ -136,7 +136,7 @@
 
 namespace Common {
 
-typedef HashMap<String, int, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringIntMap;
+typedef HashMap<String, int> StringIntMap;
 
 // The following two objects could be turned into static members of class
 // File. However, then we would be forced to #include hashmap in file.h

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/engines/agi/detection.cpp	2008-06-11 06:00:56 UTC (rev 32663)
@@ -2148,7 +2148,7 @@
 }
 
 const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const FSList *fslist) const {
-	typedef Common::HashMap<Common::String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> IntMap;
+	typedef Common::HashMap<Common::String, int32> IntMap;
 	IntMap allFiles;
 	bool matchedUsingFilenames = false;
 	bool matchedUsingWag = false;

Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/engines/cine/cine.h	2008-06-11 06:00:56 UTC (rev 32663)
@@ -64,7 +64,7 @@
 
 struct CINEGameDescription;
 
-typedef Common::HashMap<Common::String, const char *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> StringPtrHashMap;
+typedef Common::HashMap<Common::String, const char *> StringPtrHashMap;
 
 class CineEngine : public Engine {
 

Modified: scummvm/trunk/graphics/fontman.h
===================================================================
--- scummvm/trunk/graphics/fontman.h	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/graphics/fontman.h	2008-06-11 06:00:56 UTC (rev 32663)
@@ -84,7 +84,7 @@
 	friend class Common::Singleton<SingletonBaseType>;
 	FontManager();
 
-	Common::HashMap<Common::String, const Font *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> _fontMap;
+	Common::HashMap<Common::String, const Font *> _fontMap;
 };
 
 

Modified: scummvm/trunk/gui/eval.h
===================================================================
--- scummvm/trunk/gui/eval.h	2008-06-10 23:13:28 UTC (rev 32662)
+++ scummvm/trunk/gui/eval.h	2008-06-11 06:00:56 UTC (rev 32663)
@@ -68,9 +68,9 @@
 
 	char *lastToken() { return _token; }
 
-	typedef HashMap<String, int, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> VariablesMap;
-	typedef HashMap<String, String, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> AliasesMap;
-	typedef HashMap<String, String, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> StringsMap;
+	typedef HashMap<String, int> VariablesMap;
+	typedef HashMap<String, String> AliasesMap;
+	typedef HashMap<String, String> StringsMap;
 
 private:
 	enum TokenTypes {


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