diff options
| author | Lars Persson | 2006-04-21 20:50:28 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-04-21 20:50:28 +0000 |
| commit | fb905751c77006e0eefd31a45fd74d02163a7a42 (patch) | |
| tree | 19770941f14d392874df0e3b7af1ab746aada305 /base | |
| parent | 86bc1d49230b229ebb885138655b0e37f8130936 (diff) | |
| download | scummvm-rg350-fb905751c77006e0eefd31a45fd74d02163a7a42.tar.gz scummvm-rg350-fb905751c77006e0eefd31a45fd74d02163a7a42.tar.bz2 scummvm-rg350-fb905751c77006e0eefd31a45fd74d02163a7a42.zip | |
Conflicting domains for String definition. Added Common:: to String to clarify domain.
svn-id: r22072
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp index b2bae600fe..f5b2ef49bf 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -84,14 +84,14 @@ void listTargets() { 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")); + Common::String name(iter->_key); + Common::String description(iter->_value.get("description")); if (description.empty()) { // FIXME: At this point, we should check for a "gameid" override // to find the proper desc. In fact, the platform probably should // be taken into account, too. - String gameid(name); + Common::String gameid(name); GameDescriptor g = GameDetector::findGame(gameid); if (g.description.size() > 0) description = g.description; @@ -292,7 +292,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) { #if defined(__SYMBIAN32__) || defined(_WIN32_WCE) // init keymap support here: we wanna move this somewhere else? - GUI::Actions::init(ConfMan.get("gameid")); + GUI::Actions::init(); #endif #ifdef PALMOS_68K |