From f59eb3b2194826c73f56161497f4004b2313efa2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 Feb 2004 00:19:57 +0000
Subject: renamed (Const)Iterator to (const_)iterator; changed size() to return
 an uint

svn-id: r12722
---
 common/config-manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common/config-manager.cpp')

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 7f3f45d540..299d3c817e 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -171,7 +171,7 @@ void ConfigManager::flushToDisk() {
 	if (!(cfg_file = fopen(_filename.c_str(), "w"))) {
 		warning("Unable to write configuration file: %s.\n", _filename.c_str());
 	} else {
-		DomainMap::ConstIterator d;
+		DomainMap::const_iterator d;
 
 		// First write the global domains
 		for (d = _globalDomains.begin(); d != _globalDomains.end(); ++d) {
@@ -193,7 +193,7 @@ void ConfigManager::writeDomain(FILE *file, const String &name, const Domain &do
 	
 	fprintf(file, "[%s]\n", name.c_str());
 
-	Domain::ConstIterator x;
+	Domain::const_iterator x;
 	for (x = domain.begin(); x != domain.end(); ++x) {
 		const String &value = x->_value;
 		if (!value.isEmpty())
@@ -218,7 +218,7 @@ bool ConfigManager::hasKey(const String &key) const {
 	if (!_activeDomain.isEmpty() && _gameDomains[_activeDomain].contains(key))
 		return true;
 	
-	DomainMap::ConstIterator iter;
+	DomainMap::const_iterator iter;
 	for (iter = _globalDomains.begin(); iter != _globalDomains.end(); ++iter) {
 		if (iter->_value.contains(key))
 			return true;
@@ -273,7 +273,7 @@ const String & ConfigManager::get(const String &key, const String &domain) const
 	if (!dom.isEmpty() && _gameDomains.contains(dom) && _gameDomains[dom].contains(key))
 		return _gameDomains[dom][key];
 
-	DomainMap::ConstIterator iter;
+	DomainMap::const_iterator iter;
 	for (iter = _globalDomains.begin(); iter != _globalDomains.end(); ++iter) {
 		if (iter->_value.contains(key))
 			return iter->_value[key];
-- 
cgit v1.2.3