Moved AdvancedDetector from common/ to engines/

svn-id: r36132

1 files changed, 15 insertions, 15 deletions

diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 10882662d1..17f43e2e6a 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -26,7 +26,7 @@
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 #include "common/system.h"
 
 #include "parallaction/parallaction.h"
@@ -34,7 +34,7 @@
 namespace Parallaction {
 
 struct PARALLACTIONGameDescription {
-	Common::ADGameDescription desc;
+	ADGameDescription desc;
 
 	int gameType;
 	uint32 features;
@@ -73,7 +73,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_Nippon,
 		GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT,
@@ -96,7 +96,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_Nippon,
 		GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_MULT,
@@ -113,7 +113,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GType_Nippon,
 		GF_LANG_EN | GF_DEMO,
@@ -135,7 +135,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_Nippon,
 		GF_LANG_IT,
@@ -152,7 +152,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_BRA,
 		GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT,
@@ -168,7 +168,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GType_BRA,
 		GF_LANG_EN | GF_DEMO,
@@ -185,7 +185,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformAmiga,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GType_BRA,
 		GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT,
@@ -202,7 +202,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 			},
 			Common::UNK_LANG,
 			Common::kPlatformAmiga,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GType_BRA,
 		GF_LANG_EN | GF_DEMO,
@@ -213,7 +213,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
 
 }
 
-static const Common::ADParams detectionParams = {
+static const ADParams detectionParams = {
 	// Pointer to ADGameDescription or its superset structure
 	(const byte *)Parallaction::gameDescriptions,
 	// Size of that superset structure
@@ -232,9 +232,9 @@ static const Common::ADParams detectionParams = {
 	0
 };
 
-class ParallactionMetaEngine : public Common::AdvancedMetaEngine {
+class ParallactionMetaEngine : public AdvancedMetaEngine {
 public:
-	ParallactionMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	ParallactionMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
 		return "Parallaction engine";
@@ -245,7 +245,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;
@@ -263,7 +263,7 @@ bool Parallaction::Parallaction::hasFeature(EngineFeature f) const {
 		(f == kSupportsRTL);
 }
 
-bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Parallaction::PARALLACTIONGameDescription *gd = (const Parallaction::PARALLACTIONGameDescription *)desc;
 	bool res = true;