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

svn-id: r18038

6 files changed, 21 insertions, 21 deletions

diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index 6735c50973..490e0c3a7b 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -180,7 +180,7 @@ public:
 	void ColorToRGB(byte color, uint8 &r, uint8 &g, uint8 &b);
 
 	// Savefile management
-	SaveFileManager *getSavefileManager();
+	Common::SaveFileManager *getSavefileManager();
 
 	static OSystem *create();
 
diff --git a/backends/PalmOS/Src/palmsave.cpp b/backends/PalmOS/Src/palmsave.cpp
index 760460f369..a13a112e0f 100644
--- a/backends/PalmOS/Src/palmsave.cpp
+++ b/backends/PalmOS/Src/palmsave.cpp
@@ -28,7 +28,7 @@
 
 // SaveFile class
 
-class PalmSaveFile : public SaveFile {
+class PalmSaveFile : public Common::SaveFile {
 public:
 	PalmSaveFile(const char *filename, bool saveOrLoad);
 	~PalmSaveFile();
@@ -126,27 +126,27 @@ uint32 PalmSaveFile::write(const void *buf, uint32 size) {
 
 class PalmSaveFileManager : public SaveFileManager {
 public:
-	virtual OutSaveFile *openForSaving(const char *filename) {
+	virtual Common::OutSaveFile *openForSaving(const char *filename) {
 		return openSavefile(filename, true);
 	}
-	virtual InSaveFile *openForLoading(const char *filename) {
+	virtual Common::InSaveFile *openForLoading(const char *filename) {
 		return openSavefile(filename, false);
 	}
 
-	SaveFile *openSavefile(const char *filename, bool saveOrLoad);
+	Common::SaveFile *openSavefile(const char *filename, bool saveOrLoad);
 	void listSavefiles(const char *prefix, bool *marks, int num);
 
 protected:
-	SaveFile *makeSaveFile(const char *filename, bool saveOrLoad);
+	Common::SaveFile *makeSaveFile(const char *filename, bool saveOrLoad);
 };
 
-SaveFile *PalmSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) {
+Common::SaveFile *PalmSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) {
 	char buf[256];
 
 	strncpy(buf, getSavePath(), sizeof(buf));
 	strncat(buf, filename, sizeof(buf));
 
-	SaveFile *sf = makeSaveFile(buf, saveOrLoad);
+	Common::SaveFile *sf = makeSaveFile(buf, saveOrLoad);
 	if (!sf->isOpen()) {
 		delete sf;
 		sf = NULL;
@@ -194,11 +194,11 @@ void PalmSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num
 	VFSFileClose(fileRef);
 }
 
-SaveFile *PalmSaveFileManager::makeSaveFile(const char *filename, bool saveOrLoad) {
+Common::SaveFile *PalmSaveFileManager::makeSaveFile(const char *filename, bool saveOrLoad) {
 	return new PalmSaveFile(filename, saveOrLoad);
 }
 
 // OSystem
-SaveFileManager *OSystem_PALMOS::getSavefileManager() {
+Common::SaveFileManager *OSystem_PALMOS::getSavefileManager() {
 	return new PalmSaveFileManager();
 }
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index 3b7c0ae31f..d95c6f7f37 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -161,7 +161,7 @@ class OSystem_Dreamcast : public OSystem {
   void setWindowCaption(const char *caption);
 
   // Savefile handling
-  SaveFileManager *getSavefileManager();
+  Common::SaveFileManager *getSavefileManager();
 
 
   // Extra SoftKbd support
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index cf6ead1100..63710a0344 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -216,7 +216,7 @@ bool readSaveGame(char *&buffer, int &size, const char *filename)
 }
 
 
-class InVMSave : public InSaveFile {
+class InVMSave : public Common::InSaveFile {
 private:
   char *buffer;
   int pos, size;
@@ -254,7 +254,7 @@ public:
   }
 };
 
-class OutVMSave : public OutSaveFile {
+class OutVMSave : public Common::OutSaveFile {
 private:
   char *buffer;
   int pos, size;
@@ -273,14 +273,14 @@ public:
   ~OutVMSave();
 };
 
-class VMSaveManager : public SaveFileManager {
+class VMSaveManager : public Common::SaveFileManager {
 public:
   
-  virtual OutSaveFile *openForSaving(const char *filename) {
+  virtual Common::OutSaveFile *openForSaving(const char *filename) {
 	return new OutVMSave(filename);
   }
 
-  virtual InSaveFile *openForLoading(const char *filename) {
+  virtual Common::InSaveFile *openForLoading(const char *filename) {
 	InVMSave *s = new InVMSave();
 	if(s->readSaveGame(filename)) {
 	  s->tryUncompress();
@@ -349,7 +349,7 @@ void VMSaveManager::listSavefiles(const char *prefix, bool *marks, int num)
     tryList(prefix, marks, num, i);
 }
 
-SaveFileManager *OSystem_Dreamcast::getSavefileManager()
+Common::SaveFileManager *OSystem_Dreamcast::getSavefileManager()
 {
   return new VMSaveManager();
 }
diff --git a/backends/ps2/savefile.h b/backends/ps2/savefile.h
index 66d27f1bbb..364a80dbed 100644
--- a/backends/ps2/savefile.h
+++ b/backends/ps2/savefile.h
@@ -34,13 +34,13 @@ enum SaveMode {
 class Gs2dScreen;
 class OSystem_PS2;
 
-class Ps2SaveFileManager : public SaveFileManager {
+class Ps2SaveFileManager : public Common::SaveFileManager {
 public:
 	Ps2SaveFileManager(OSystem_PS2 *system, Gs2dScreen *screen);
 	virtual ~Ps2SaveFileManager();
 
-	virtual InSaveFile *openForLoading(const char *filename);
-	virtual OutSaveFile *openForSaving(const char *filename);
+	virtual Common::InSaveFile *openForLoading(const char *filename);
+	virtual Common::OutSaveFile *openForSaving(const char *filename);
 	virtual void listSavefiles(const char *prefix, bool *marks, int num);
 
 	/** Get the path to the save game directory. */
diff --git a/backends/ps2/systemps2.h b/backends/ps2/systemps2.h
index 942cf1b851..20c97da085 100644
--- a/backends/ps2/systemps2.h
+++ b/backends/ps2/systemps2.h
@@ -85,7 +85,7 @@ public:
 
 	virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
 
-	virtual SaveFileManager *getSavefileManager();
+	virtual Common::SaveFileManager *getSavefileManager();
 
 	void timerThread(void);
 	void soundThread(void);