Removed GameDetector::_gameid in favor of using a config manager entry

svn-id: r21915

2 files changed, 8 insertions, 12 deletions

diff --git a/gui/Actions.cpp b/gui/Actions.cpp
index 79c7005733..53af60734b 100644
--- a/gui/Actions.cpp
+++ b/gui/Actions.cpp
@@ -39,8 +39,8 @@ Actions* Actions::Instance() {
 	return _instance;
 }
 
-Actions::Actions(const Common::String &gameid) :
-	_gameid(gameid), _mapping_active(false), _initialized(false)
+Actions::Actions() :
+	_mapping_active(false), _initialized(false)
 {
 }
 
@@ -49,15 +49,15 @@ Actions::~Actions() {
 }
 
 // call the correct object creator function according to the Factory Pattern
-void Actions::init(const Common::String &gameid) {
+void Actions::init() {
 #ifdef _WIN32_WCE
 	// For WinCE: now use software + Factory pattern to create correct objects
 	if (!CEDevice::isSmartphone())
-		CEActionsPocket::init(gameid);
+		CEActionsPocket::init();
 	else
-		CEActionsSmartphone::init(gameid);
+		CEActionsSmartphone::init();
 #elif defined(__SYMBIAN32__)
-	SymbianActions::init(gameid);
+	SymbianActions::init();
 #endif
 }
 
diff --git a/gui/Actions.h b/gui/Actions.h
index 40a72b4beb..3e9bd4d8f8 100644
--- a/gui/Actions.h
+++ b/gui/Actions.h
@@ -37,7 +37,7 @@ class Actions {
 
 public:
 	static Actions* Instance();
-	static void init(const Common::String &gameid);
+	static void init();
 	virtual void initInstanceMain(OSystem *mainSystem);
 	virtual void initInstanceGame();
 	bool initialized();
@@ -65,12 +65,8 @@ public:
 
 	virtual ~Actions();
 
-public:
-	// Since _gameid is const it's safe to let the public read it.
-	const Common::String _gameid;
-
 protected:
-	Actions(const Common::String &gameid);
+	Actions();
 
 protected:
 	static Actions* _instance;