aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2005-04-23 17:33:28 +0000
committerMax Horn2005-04-23 17:33:28 +0000
commit55947fb319edfac1563152968b97a24295f95248 (patch)
treec5b30c0ef2f5851ff4429a08b16d8121c7e5b082
parentef760277e62438d2d9a8a389746b5e811c3c5264 (diff)
downloadscummvm-rg350-55947fb319edfac1563152968b97a24295f95248.tar.gz
scummvm-rg350-55947fb319edfac1563152968b97a24295f95248.tar.bz2
scummvm-rg350-55947fb319edfac1563152968b97a24295f95248.zip
Make StringMap class (with case insensitive keys) global
svn-id: r17779
-rw-r--r--common/config-manager.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/common/config-manager.h b/common/config-manager.h
index 67962239cb..c8e6045056 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -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: