Moved AdvancedDetector from common/ to engines/

svn-id: r36132

1 files changed, 14 insertions, 14 deletions

diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index c8aefedbd1..e38cec0551 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -27,14 +27,14 @@
 
 #include "base/plugins.h"
 
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 
 #include "cruise/cruise.h"
 
 namespace Cruise {
 
 struct CRUISEGameDescription {
-	Common::ADGameDescription desc;
+	ADGameDescription desc;
 
 	int gameType;
 	uint32 features;
@@ -61,7 +61,7 @@ static const PlainGameDescriptor cruiseGames[] = {
 	{0, 0}
 };
 
-static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = {
+static const ADObsoleteGameID obsoleteGameIDsTable[] = {
 	{"cruise", "cruise", Common::kPlatformUnknown},
 	{0, 0, Common::kPlatformUnknown}
 };
@@ -76,7 +76,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "41a7a4d426dbd048eb369cfee4bb2717"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -88,7 +88,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "a90d2b9ead6b4d812cd14268672cf178"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -100,7 +100,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "e258865807ea31b2d523340e6f0a606b"),
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -112,7 +112,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "f2a26522d49983c4ae32bcccbb801b02"),
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -124,7 +124,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "e19a4ab2e24a69087e4ea994a5506231"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -136,7 +136,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 			AD_ENTRY1("D1", "9a302ada55600d96061fda1d63a6ccda"),
 			Common::ES_ESP,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_CRUISE,
 		0,
@@ -146,7 +146,7 @@ static const CRUISEGameDescription gameDescriptions[] = {
 
 }
 
-static const Common::ADParams detectionParams = {
+static const ADParams detectionParams = {
 	// Pointer to ADGameDescription or its superset structure
 	(const byte *)Cruise::gameDescriptions,
 	// Size of that superset structure
@@ -165,9 +165,9 @@ static const Common::ADParams detectionParams = {
 	0
 };
 
-class CruiseMetaEngine : public Common::AdvancedMetaEngine {
+class CruiseMetaEngine : public AdvancedMetaEngine {
 public:
-	CruiseMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	CruiseMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
 		return "Cinematique evo 2 engine";
@@ -177,10 +177,10 @@ public:
 		return "Cruise for a Corpse (C) Delphine Software";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
 };
 
-bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Cruise::CRUISEGameDescription *gd = (const Cruise::CRUISEGameDescription *)desc;
 	if (gd) {
 		*engine = new Cruise::CruiseEngine(syst, gd);