Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

svn-id: r18038

2 files changed, 9 insertions, 7 deletions

diff --git a/queen/queen.cpp b/queen/queen.cpp
index 67b28f8308..a1d1ecae67 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -252,7 +252,7 @@ void QueenEngine::saveGameState(uint16 slot, const char *desc) {
 	debug(3, "Saving game to slot %d", slot);
 	char name[20];
 	makeGameStateName(slot, name);
-	OutSaveFile *file = _saveFileMan->openForSaving(name);
+	Common::OutSaveFile *file = _saveFileMan->openForSaving(name);
 	if (file) {
 		// save data
 		byte *saveData = new byte[30000];
@@ -287,7 +287,7 @@ void QueenEngine::saveGameState(uint16 slot, const char *desc) {
 void QueenEngine::loadGameState(uint16 slot) {
 	debug(3, "Loading game from slot %d", slot);
 	GameStateHeader header;
-	InSaveFile *file = readGameStateHeader(slot, &header);
+	Common::InSaveFile *file = readGameStateHeader(slot, &header);
 	if (file && header.dataSize != 0) {
 		byte *saveData = new byte[header.dataSize];
 		byte *p = saveData;
@@ -308,10 +308,10 @@ void QueenEngine::loadGameState(uint16 slot) {
 	}
 }
 
-InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
+Common::InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
 	char name[20];
 	makeGameStateName(slot, name);
-	InSaveFile *file = _saveFileMan->openForLoading(name);
+	Common::InSaveFile *file = _saveFileMan->openForLoading(name);
 	if (file && file->readUint32BE() == 'SCVM') {
 		gsh->version = file->readUint32BE();
 		gsh->flags = file->readUint32BE();
@@ -340,7 +340,7 @@ void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) {
 	for (int i = 0; i < SAVESTATE_MAX; ++i) {
 		if (marks[i]) {
 			GameStateHeader header;
-			InSaveFile *f = readGameStateHeader(i, &header);
+			Common::InSaveFile *f = readGameStateHeader(i, &header);
 			strcpy(descriptions[i], header.description);
 			delete f;
 		}
diff --git a/queen/queen.h b/queen/queen.h
index d947469ae8..f6e614885e 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -25,7 +25,9 @@
 #include "base/engine.h"
 
 class GameDetector;
-class InSaveFile;
+namespace Common {
+	class InSaveFile;
+}
 
 #if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
 
@@ -114,7 +116,7 @@ public:
 	void loadGameState(uint16 slot);
 	void makeGameStateName(uint16 slot, char *buf);
 	void findGameStateDescriptions(char descriptions[100][32]);
-	InSaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
+	Common::InSaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
 
 	enum {
 		SAVESTATE_CUR_VER = 1,