thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make use of new List iterator

Browse source 
svn-id: r10609
This commit is contained in:
Max Horn 2003-10-05 14:03:07 +00:00
parent a0fb1850de
commit fd2c041d79
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/gameDetector.cpp
View file

@ -298,8 +298,9 @@ void GameDetector::list_games() {
printf("Game Full Title Config\n" printf("Game Full Title Config\n"
"---------------- ------------------------------------------------------ -------\n"); "---------------- ------------------------------------------------------ -------\n");
for (int i = 0; i < plugins.size(); i++) { PluginList::ConstIterator iter = plugins.begin();
v = plugins[i]->getTargets(); for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
v = (*iter)->getTargets();
while (v->targetName && v->description) { while (v->targetName && v->description) {
config = (g_config->has_domain(v->targetName)) ? "Yes" : ""; config = (g_config->has_domain(v->targetName)) ? "Yes" : "";
printf("%-17s%-56s%s\n", v->targetName, v->description, config); printf("%-17s%-56s%s\n", v->targetName, v->description, config);
@ -314,11 +315,12 @@ const TargetSettings *GameDetector::findTarget(const char *targetName, const Plu
const TargetSettings *target; const TargetSettings *target;
const PluginList &plugins = g_pluginManager->getPlugins(); const PluginList &plugins = g_pluginManager->getPlugins();
for (int i = 0; i < plugins.size(); i++) { PluginList::ConstIterator iter = plugins.begin();
target = plugins[i]->findTarget(targetName); for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
target = (*iter)->findTarget(targetName);
if (target) { if (target) {
if (plugin) if (plugin)
*plugin = plugins[i]; *plugin = *iter;
return target; return target;
} }
} }

12
gui/launcher.cpp
View file

@ -228,18 +228,18 @@ void LauncherDialog::close() {
} }
void LauncherDialog::updateListing() { void LauncherDialog::updateListing() {
int i;
Common::StringList l; Common::StringList l;
// Retrieve a list of all games defined in the config file // Retrieve a list of all games defined in the config file
_domains.clear(); _domains.clear();
StringList domains = g_config->get_domains(); StringList domains = g_config->get_domains();
for (i = 0; i < domains.size(); i++) { StringList::ConstIterator iter = domains.begin();
String name(g_config->get("gameid", domains[i])); for (iter = domains.begin(); iter != domains.end(); ++iter) {
String description(g_config->get("description", domains[i])); String name(g_config->get("gameid", *iter));
String description(g_config->get("description", *iter));
if (name.isEmpty()) if (name.isEmpty())
name = domains[i]; name = *iter;
if (description.isEmpty()) { if (description.isEmpty()) {
const TargetSettings *v = _detector.findTarget(name.c_str()); const TargetSettings *v = _detector.findTarget(name.c_str());
if (v && v->description) if (v && v->description)
@ -253,7 +253,7 @@ void LauncherDialog::updateListing() {
while (pos < size && (description > l[pos])) while (pos < size && (description > l[pos]))
pos++; pos++;
l.insert_at(pos, description); l.insert_at(pos, description);
_domains.insert_at(pos, domains[i]); _domains.insert_at(pos, *iter);
} }
} }