Moved AdvancedDetector from common/ to engines/

svn-id: r36132

1 files changed, 18 insertions, 18 deletions

diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 2b9222ebe5..462b6c9ca4 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/config-manager.h"
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 #include "common/savefile.h"
 #include "common/system.h"
 
@@ -39,14 +39,14 @@ static const PlainGameDescriptor toucheGames[] = {
 
 namespace Touche {
 
-static const Common::ADGameDescription gameDescriptions[] = {
+static const ADGameDescription gameDescriptions[] = {
 	{ // retail version
 		"touche",
 		"",
 		AD_ENTRY1s("touche.dat", "2af0177f8887e3430f345e6b4d8b1414", 26350211),
 		Common::EN_ANY,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // retail version - tracker item #1601818
 		"touche",
@@ -54,7 +54,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "95967f0b51d2e813e99ca00325098340", 26350190),
 		Common::EN_ANY,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // retail version
 		"touche",
@@ -62,7 +62,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "1caa20bb4d4fc2ce8eb867b6610082b3", 26558232),
 		Common::FR_FRA,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // retail version - tracker item #1598643
 		"touche",
@@ -70,7 +70,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "be2ae6454b3325e410946f2322547cd4", 26625537),
 		Common::DE_DEU,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // retail version - tracker item #1681643
 		"touche",
@@ -78,7 +78,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "64e95ba1decf5a5a60f8fa1840f40c62", 26529523),
 		Common::ES_ESP,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // fan-made translation (http://www.iagtg.net/) - tracker item #1602360
 		"touche",
@@ -86,7 +86,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "1f442331d4b327c3488a9f6ffe9bdd25", 26367792),
 		Common::IT_ITA,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // retail version - tracker item #1800500
 		"touche",
@@ -94,7 +94,7 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "42d19a0bef65465109020440a9caa228", 26487370),
 		Common::PL_POL,
 		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
+		ADGF_NO_FLAGS
 	},
 	{ // demo version
 		"touche",
@@ -102,32 +102,32 @@ static const Common::ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("touche.dat", "ddaed436445b2e77294ed19e8ae4aa2c", 8720683),
 		Common::EN_ANY,
 		Common::kPlatformPC,
-		Common::ADGF_DEMO
+		ADGF_DEMO
 	},
 	AD_TABLE_END_MARKER
 };
 
-static const Common::ADFileBasedFallback fileBasedFallback[] = {
+static const ADFileBasedFallback fileBasedFallback[] = {
 	{ &gameDescriptions[0], { "touche.dat", 0 } }, // default to english version
 	{ 0, { 0 } }
 };
 
 } // End of namespace Touche
 
-static const Common::ADParams detectionParams = {
+static const ADParams detectionParams = {
 	(const byte *)Touche::gameDescriptions,
-	sizeof(Common::ADGameDescription),
+	sizeof(ADGameDescription),
 	4096, // number of md5 bytes
 	toucheGames,
 	0, // no obsolete targets data
 	"touche",
 	Touche::fileBasedFallback, // file-based detection data to enable not yet known versions to start
-	Common::kADFlagPrintWarningOnFileBasedFallback
+	kADFlagPrintWarningOnFileBasedFallback
 };
 
-class ToucheMetaEngine : public Common::AdvancedMetaEngine {
+class ToucheMetaEngine : public AdvancedMetaEngine {
 public:
-	ToucheMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	ToucheMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
 		return "Touche Engine";
@@ -138,7 +138,7 @@ public:
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
 	virtual SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
 	virtual void removeSaveState(const char *target, int slot) const;
@@ -158,7 +158,7 @@ bool Touche::ToucheEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
-bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	if (desc) {
 		*engine = new Touche::ToucheEngine(syst, desc->language);
 	}