[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.h,1.36,1.37 palmsave.cpp,1.16,1.17

Max Horn fingolfin at users.sourceforge.net
Tue May 10 16:21:20 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345/backends/PalmOS/Src

Modified Files:
	palm.h palmsave.cpp 
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- palm.h	9 Apr 2005 13:31:46 -0000	1.36
+++ palm.h	10 May 2005 23:17:12 -0000	1.37
@@ -180,7 +180,7 @@
 	void ColorToRGB(byte color, uint8 &r, uint8 &g, uint8 &b);
 
 	// Savefile management
-	SaveFileManager *getSavefileManager();
+	Common::SaveFileManager *getSavefileManager();
 
 	static OSystem *create();
 

Index: palmsave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmsave.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- palmsave.cpp	10 Apr 2005 15:13:31 -0000	1.16
+++ palmsave.cpp	10 May 2005 23:17:12 -0000	1.17
@@ -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 @@
 
 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 @@
 	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();
 }





More information about the Scummvm-git-logs mailing list