diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/gameDetector.cpp | 8 | ||||
| -rw-r--r-- | base/plugins.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index e59727d45d..9a7b9c7cdb 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -159,10 +159,10 @@ void listGames() { 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 @@ void listTargets() { 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 @@ GameSettings GameDetector::findGame(const String &gameName, const Plugin **plugi 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) { diff --git a/base/plugins.cpp b/base/plugins.cpp index ca2fd6136f..c106f52d69 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -53,7 +53,7 @@ GameSettings Plugin::findGame(const char *gameName) const { 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::loadPlugins() { } void PluginManager::unloadPlugins() { - int i; + uint i; for (i = 0; i < _plugins.size(); i++) { _plugins[i]->unloadPlugin(); delete _plugins[i]; @@ -281,7 +281,7 @@ DetectedGameList PluginManager::detectGames(const FSList &fslist) const { // 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)); } |