4 files changed, 20 insertions, 20 deletions

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];
diff --git a/common/list.h b/common/list.h
index c06008a8c9..b4fea866ff 100644
--- a/common/list.h
+++ b/common/list.h
@@ -34,8 +34,8 @@ protected:
 	T *_data;
 
 public:
-	typedef T *Iterator;
-	typedef const T *ConstIterator;
+	typedef T *iterator;
+	typedef const T *const_iterator;
 
 public:
 	List<T>() : _capacity(0), _size(0), _data(0) {}
@@ -103,7 +103,7 @@ public:
 		return *this;
 	}
 
-	int size() const {
+	uint size() const {
 		return _size;
 	}
 
@@ -121,19 +121,19 @@ public:
 	}
 
 
-	Iterator		begin() {
+	iterator		begin() {
 		return _data;
 	}
 
-	Iterator		end() {
+	iterator		end() {
 		return _data + _size;
 	}
 
-	ConstIterator	begin() const {
+	const_iterator	begin() const {
 		return _data;
 	}
 
-	ConstIterator	end() const {
+	const_iterator	end() const {
 		return _data + _size;
 	}
 
diff --git a/common/map.h b/common/map.h
index f1fb3c398e..8f08b79b58 100644
--- a/common/map.h
+++ b/common/map.h
@@ -68,19 +68,19 @@ private:
 	Map<Key, Value, Comparator> &operator =(const Map<Key, Value, Comparator> &map);
 
 public:
-	class ConstIterator {
+	class const_iterator {
 		friend class Map<Key, Value, Comparator>;
 	protected:
 		Node *_node;
-		ConstIterator(Node *node) : _node(node) {}
+		const_iterator(Node *node) : _node(node) {}
 		
 	public:
-		ConstIterator() : _node(0) {}
+		const_iterator() : _node(0) {}
 
 		Node &operator *() { assert(_node != 0); return *_node; }
 		const Node &operator *() const { assert(_node != 0); return *_node; }
 		const Node *operator->() const { assert(_node != 0); return _node; }
-		bool operator !=(const ConstIterator &iter) const { return _node != iter._node; }
+		bool operator !=(const const_iterator &iter) const { return _node != iter._node; }
 		void operator ++() {
 			if (!_node)
 				return;
@@ -203,17 +203,17 @@ public:
 		merge(map._root);
 	}
 
-	ConstIterator	begin() const {
+	const_iterator	begin() const {
 		Node *node = _root;
 		if (node) {
 			while (node->_left)
 				node = node->_left;
 		}
-		return ConstIterator(node);
+		return const_iterator(node);
 	}
 
-	ConstIterator	end() const {
-		return ConstIterator();
+	const_iterator	end() const {
+		return const_iterator();
 	}
 
 protected:
diff --git a/common/str.h b/common/str.h
index e47fb8f8c1..2534dabd90 100644
--- a/common/str.h
+++ b/common/str.h
@@ -67,7 +67,7 @@ public:
 	}
 
 	const char *c_str() const		{ return _str ? _str : ""; }
-	int size() const				{ return _len; }
+	uint size() const				{ return _len; }
 
 	bool isEmpty() const	{ return (_len == 0); }
 };