[Scummvm-cvs-logs] SF.net SVN: scummvm: [22072] scummvm/trunk/base/main.cpp

[anotherguest at users.sourceforge.net]

Revision: 22072
Author:   anotherguest
Date:     2006-04-21 13:50:28 -0700 (Fri, 21 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22072&view=rev

Log Message:
-----------
Conflicting domains for String definition. Added Common:: to String to clarify domain.

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-21 20:49:06 UTC (rev 22071)
+++ scummvm/trunk/base/main.cpp	2006-04-21 20:50:28 UTC (rev 22072)
@@ -84,14 +84,14 @@
 
 	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 @@
 
 #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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.