[Scummvm-cvs-logs] CVS: scummvm/common config-manager.h,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Sat Apr 23 10:33:53 CEST 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27251

Modified Files:
	config-manager.h 
Log Message:
Make StringMap class (with case insensitive keys) global

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- config-manager.h	10 Jan 2005 22:35:43 -0000	1.23
+++ config-manager.h	23 Apr 2005 17:33:28 -0000	1.24
@@ -20,31 +20,34 @@
  *
  */
 
-#ifndef COMMON_CONFIG_H
-#define COMMON_CONFIG_H
+#ifndef COMMON_CONFIG_MANAGER_H
+#define COMMON_CONFIG_MANAGER_H
 
 #include "common/array.h"
+//#include "common/config-file.h"
 #include "common/map.h"
 #include "common/singleton.h"
 #include "common/str.h"
 
 namespace Common {
 
+struct IgnoreCaseComparator {
+  int operator()(const String& x, const String& y) const { return scumm_stricmp(x.c_str(), y.c_str()); }
+};
+
+typedef Map<String, String, IgnoreCaseComparator> StringMap;
+
 /**
  * The (singleton) configuration manager, used to query & set configuration
  * values using string keys.
  *
- * @todo Implement the callback based notification system (outline below)
+ * @todo Implement the callback based notification system (outlined below)
  *       which sends out notifications to interested parties whenever the value
  *       of some specific (or any) configuration key changes.
  */
 class ConfigManager : public Singleton<ConfigManager> {
-	struct IgnoreCaseComparator {
-	  int operator()(const String& x, const String& y) const { return scumm_stricmp(x.c_str(), y.c_str()); }
-	};
 	
 public:
-	typedef Map<String, String, IgnoreCaseComparator> StringMap;
 	
 	class Domain : public StringMap {
 	private:





More information about the Scummvm-git-logs mailing list