[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.64,1.65 plugins.cpp,1.26,1.27

[Max Horn]

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

Modified Files:
	gameDetector.cpp plugins.cpp 
Log Message:
renamed (Const)Iterator to (const_)iterator; changed size() to return an uint

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- gameDetector.cpp	29 Jan 2004 21:54:03 -0000	1.64
+++ gameDetector.cpp	5 Feb 2004 00:19:54 -0000	1.65
@@ -159,10 +159,10 @@
 	printf("Game ID              Full Title                                            \n"
 	       "-------------------- ------------------------------------------------------\n");
 
-	PluginList::ConstIterator iter = plugins.begin();
+	PluginList::const_iterator iter = plugins.begin();
 	for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
 		GameList list = (*iter)->getSupportedGames();
-		for (GameList::Iterator v = list.begin(); v != list.end(); ++v) {
+		for (GameList::iterator v = list.begin(); v != list.end(); ++v) {
 			printf("%-20s %s\n", v->name, v->description);
 		}
 	}
@@ -176,7 +176,7 @@
 	printf("Target               Description                                           \n"
 	       "-------------------- ------------------------------------------------------\n");
 
-	ConfigManager::DomainMap::ConstIterator iter = domains.begin();
+	ConfigManager::DomainMap::const_iterator iter = domains.begin();
 	for (iter = domains.begin(); iter != domains.end(); ++iter) {
 		String name(iter->_key);
 		String description(iter->_value.get("description"));
@@ -196,7 +196,7 @@
 	const PluginList &plugins = PluginManager::instance().getPlugins();
 	GameSettings result = {NULL, NULL, 0};
 
-	PluginList::ConstIterator iter = plugins.begin();
+	PluginList::const_iterator iter = plugins.begin();
 	for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
 		result = (*iter)->findGame(gameName.c_str());
 		if (result.name) {

Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- plugins.cpp	6 Jan 2004 12:45:27 -0000	1.26
+++ plugins.cpp	5 Feb 2004 00:19:54 -0000	1.27
@@ -53,7 +53,7 @@
 	assert(gameName);
 	GameList games = getSupportedGames();
 	GameSettings result = {NULL, NULL, 0};
-	for (GameList::Iterator g = games.begin(); g != games.end(); ++g) {
+	for (GameList::iterator g = games.begin(); g != games.end(); ++g) {
 		if (!scumm_stricmp(g->name, gameName)) {
 			result = *g;
 			break;
@@ -254,7 +254,7 @@
 }
 
 void PluginManager::unloadPlugins() {
-	int i;
+	uint i;
 	for (i = 0; i < _plugins.size(); i++) {
 		_plugins[i]->unloadPlugin();
 		delete _plugins[i];
@@ -281,7 +281,7 @@
 
 	// Iterate over all known games and for each check if it might be
 	// the game in the presented directory.
-	PluginList::ConstIterator iter;
+	PluginList::const_iterator iter;
 	for (iter = _plugins.begin(); iter != _plugins.end(); ++iter) {
 		candidates.push_back((*iter)->detectGames(fslist));
 	}