renamed (Const)Iterator to (const_)iterator; changed size() to return an uint

svn-id: r12722

4 files changed, 13 insertions, 13 deletions

diff --git a/backends/dc/selector.cpp b/backends/dc/selector.cpp
index 2b65a9e7cb..38f7ebf024 100644
--- a/backends/dc/selector.cpp
+++ b/backends/dc/selector.cpp
@@ -167,7 +167,7 @@ static const char *checkDetect(const FilesystemNode *entry)
   DetectedGameList candidates;
 
   const PluginList &plugins = PluginManager::instance().getPlugins();
-  PluginList::ConstIterator iter = plugins.begin();
+  PluginList::const_iterator iter = plugins.begin();
   for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
     candidates.push_back((*iter)->detectGames(files));
   }
@@ -278,7 +278,7 @@ static int findGames(Game *games, int max)
     dirs[curr_dir].deficon[0] = '\0';
     FSList *fslist = dirs[curr_dir++].node->listDir(FilesystemNode::kListAll);
     if (fslist != NULL) {
-      for (FSList::ConstIterator entry = fslist->begin(); entry != fslist->end();
+      for (FSList::const_iterator entry = fslist->begin(); entry != fslist->end();
 	   ++entry) {
 	if (entry->isDirectory()) {
 	  if(num_dirs < MAX_DIR && strcasecmp(entry->displayName().c_str(),
diff --git a/backends/fs/fs.h b/backends/fs/fs.h
index 36c7429828..45abea5192 100644
--- a/backends/fs/fs.h
+++ b/backends/fs/fs.h
@@ -151,14 +151,14 @@ public:
  */
 class FSList : Common::List<FilesystemNode *> {
 public:
-	class ConstIterator {
+	class const_iterator {
 		friend class FSList;
 		FilesystemNode **_data;
-		ConstIterator(FilesystemNode **data) : _data(data) { }
+		const_iterator(FilesystemNode **data) : _data(data) { }
 	public:
 		const FilesystemNode &operator *() const { return **_data; }
 		const FilesystemNode *operator->() const { return *_data; }
-		bool operator !=(const ConstIterator &iter) const { return _data != iter._data; }
+		bool operator !=(const const_iterator &iter) const { return _data != iter._data; }
 		void operator ++() { ++_data; }
 	};
 
@@ -187,12 +187,12 @@ public:
 
 	int size() const	{ return _size; }
 
-	ConstIterator	begin() const {
-		return ConstIterator(_data);
+	const_iterator	begin() const {
+		return const_iterator(_data);
 	}
 
-	ConstIterator	end() const {
-		return ConstIterator(_data + _size);
+	const_iterator	end() const {
+		return const_iterator(_data + _size);
 	}
 
 };
diff --git a/backends/wince/CELauncherDialog.cpp b/backends/wince/CELauncherDialog.cpp
index fc2d6d513f..7c432f5a20 100644
--- a/backends/wince/CELauncherDialog.cpp
+++ b/backends/wince/CELauncherDialog.cpp
@@ -99,7 +99,7 @@ void CELauncherDialog::automaticScanDirectory(const FilesystemNode *node) {
 	addCandidate(node->path(), candidates);
 	// Then recurse on the subdirectories
 	FSList *dirs = node->listDir(FilesystemNode::kListDirectoriesOnly);
-	for (FSList::ConstIterator currentDir = dirs->begin(); currentDir != dirs->end(); ++currentDir)
+	for (FSList::const_iterator currentDir = dirs->begin(); currentDir != dirs->end(); ++currentDir)
 		automaticScanDirectory(&(*currentDir));
 
 }
diff --git a/backends/wince/CEgui/Panel.cpp b/backends/wince/CEgui/Panel.cpp
index d29f4004e2..2c7514af09 100644
--- a/backends/wince/CEgui/Panel.cpp
+++ b/backends/wince/CEgui/Panel.cpp
@@ -42,7 +42,7 @@ namespace CEGUI {
 	}
 
 	bool Panel::draw(SDL_Surface *surface) {
-		ItemMap::ConstIterator iterator;
+		ItemMap::const_iterator iterator;
 		if (!_drawn && _visible) {
 			GUIElement::draw(surface);
 			for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
@@ -55,14 +55,14 @@ namespace CEGUI {
 	}
 
 	void Panel::forceRedraw() {
-		ItemMap::ConstIterator iterator;
+		ItemMap::const_iterator iterator;
 		GUIElement::forceRedraw();
 		for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
 			((GUIElement*)(iterator->_value))->forceRedraw();
 	}
 
 	bool Panel::action(int x, int y, bool pushed) {
-		ItemMap::ConstIterator iterator;
+		ItemMap::const_iterator iterator;
 		bool result = false;
 		if (!checkInside(x, y))
 			return false;