Moved AdvancedDetector from common/ to engines/

svn-id: r36132

7 files changed, 38 insertions, 40 deletions

diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 2e1a0f2833..55f9f5248c 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -30,7 +30,7 @@
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"
 
@@ -43,7 +43,7 @@
 
 namespace Saga {
 struct SAGAGameDescription {
-	Common::ADGameDescription desc;
+	ADGameDescription desc;
 
 	int gameId;
 	uint32 features;
@@ -81,7 +81,7 @@ int SagaEngine::getGameNumber() const { return _gameNumber; }
 int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; }
 
 const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; }
-const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; }
+const ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; }
 
 }
 
@@ -94,7 +94,7 @@ static const PlainGameDescriptor sagaGames[] = {
 	{0, 0}
 };
 
-static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = {
+static const ADObsoleteGameID obsoleteGameIDsTable[] = {
 	{"ite", "saga", Common::kPlatformUnknown},
 	{"ihnm", "saga", Common::kPlatformUnknown},
 	{"dino", "saga", Common::kPlatformUnknown},
@@ -104,7 +104,7 @@ static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = {
 
 #include "saga/detection_tables.h"
 
-static const Common::ADParams detectionParams = {
+static const ADParams detectionParams = {
 	// Pointer to ADGameDescription or its superset structure
 	(const byte *)Saga::gameDescriptions,
 	// Size of that superset structure
@@ -123,9 +123,9 @@ static const Common::ADParams detectionParams = {
 	0
 };
 
-class SagaMetaEngine : public Common::AdvancedMetaEngine {
+class SagaMetaEngine : public AdvancedMetaEngine {
 public:
-	SagaMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {}
+	SagaMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
 		return "Saga engine ["
@@ -154,7 +154,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;
@@ -178,7 +178,7 @@ bool Saga::SagaEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
-bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Saga::SAGAGameDescription *gd = (const Saga::SAGAGameDescription *)desc;
 	if (gd) {
 		*engine = new Saga::SagaEngine(syst, gd);
diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h
index 500d5d9fed..e9099141d6 100644
--- a/engines/saga/detection_tables.h
+++ b/engines/saga/detection_tables.h
@@ -192,7 +192,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_ITE, // Game id
 		GF_OLD_ITE_DOS, // features
@@ -216,7 +216,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_ITE,
 		GF_WYRMKEEP | GF_SCENE_SUBSTITUTES | GF_MONO_MUSIC | GF_LE_VOICES,
@@ -241,7 +241,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_ITE,
 		GF_WYRMKEEP | GF_NON_INTERACTIVE | GF_LE_VOICES,
@@ -266,7 +266,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_ITE,
 		GF_WYRMKEEP | GF_SCENE_SUBSTITUTES,
@@ -291,7 +291,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_ITE,
 		GF_WYRMKEEP | GF_NON_INTERACTIVE | GF_8BIT_UNSIGNED_PCM,
@@ -323,7 +323,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_8BIT_UNSIGNED_PCM,
@@ -346,7 +346,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_WYRMKEEP,
@@ -377,7 +377,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformUnknown,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_WYRMKEEP,
@@ -406,7 +406,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformUnknown,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_WYRMKEEP,
@@ -429,7 +429,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_EXTRA_ITE_CREDITS,
@@ -452,7 +452,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		0,
@@ -475,7 +475,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		0,
@@ -499,7 +499,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		0,
@@ -525,7 +525,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_ITE_FLOPPY,
@@ -548,7 +548,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_ITE_FLOPPY,
@@ -571,7 +571,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_ITE,
 		GF_ITE_FLOPPY,
@@ -603,7 +603,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_DEMO
+			ADGF_DEMO
 		},
 		GID_IHNM,
 		GF_IHNM_DEMO,
@@ -634,7 +634,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -663,7 +663,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -690,7 +690,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::ES_ESP,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -718,7 +718,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -745,7 +745,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -769,7 +769,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_IHNM,
 		0,
@@ -803,7 +803,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			ADGF_NO_FLAGS
 		},
 		GID_FTA2,
 		0,
diff --git a/engines/saga/resource.cpp b/engines/saga/resource.cpp
index e2fe158c12..981238d3a3 100644
--- a/engines/saga/resource.cpp
+++ b/engines/saga/resource.cpp
@@ -35,7 +35,7 @@
 #include "saga/scene.h"
 #include "saga/sndres.h"
 
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 
 namespace Saga {
 
diff --git a/engines/saga/resource_hrs.cpp b/engines/saga/resource_hrs.cpp
index e06d03c604..32d92531d8 100644
--- a/engines/saga/resource_hrs.cpp
+++ b/engines/saga/resource_hrs.cpp
@@ -37,7 +37,7 @@
 #include "saga/scene.h"
 #include "saga/sndres.h"
 
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 #include "common/endian.h"
 
 namespace Saga {
diff --git a/engines/saga/resource_res.cpp b/engines/saga/resource_res.cpp
index ca3c2a7ae0..8de5529540 100644
--- a/engines/saga/resource_res.cpp
+++ b/engines/saga/resource_res.cpp
@@ -35,7 +35,7 @@
 #include "saga/scene.h"
 #include "saga/sndres.h"
 
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 
 namespace Saga {
 
diff --git a/engines/saga/resource_rsc.cpp b/engines/saga/resource_rsc.cpp
index 8176d6ec02..17b330ea5e 100644
--- a/engines/saga/resource_rsc.cpp
+++ b/engines/saga/resource_rsc.cpp
@@ -35,7 +35,7 @@
 #include "saga/scene.h"
 #include "saga/sndres.h"
 
-#include "common/advancedDetector.h"
+#include "engines/advancedDetector.h"
 
 namespace Saga {
 
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index f323e9617d..9f6b0d814b 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -34,9 +34,7 @@
 #include "saga/gfx.h"
 #include "saga/list.h"
 
-namespace Common {
 struct ADGameFileDescription;
-}
 
 namespace Saga {
 
@@ -603,7 +601,7 @@ public:
 
 	const GamePatchDescription *getPatchDescriptions() const;
 
-	const Common::ADGameFileDescription *getFilesDescriptions() const;
+	const ADGameFileDescription *getFilesDescriptions() const;
 
 	const Common::Rect &getDisplayClip() const { return _displayClip;}
 	Common::Error loadGameState(int slot);