From fb79b185717c9aae7c793e7f07d5d6b94aec4abf Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 29 May 2009 14:38:22 +0000 Subject: Changed SaveFileManager methods to take Common::String params (instead of char pointers) svn-id: r41000 --- backends/platform/ds/arm9/source/gbampsave.cpp | 10 ++++------ backends/platform/ds/arm9/source/gbampsave.h | 10 +++++----- backends/platform/ds/arm9/source/ramsave.cpp | 14 +++++++------- backends/platform/ds/arm9/source/ramsave.h | 10 +++++----- 4 files changed, 21 insertions(+), 23 deletions(-) (limited to 'backends/platform/ds') diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp index 385935e816..3ca0bb3bb8 100644 --- a/backends/platform/ds/arm9/source/gbampsave.cpp +++ b/backends/platform/ds/arm9/source/gbampsave.cpp @@ -144,7 +144,7 @@ GBAMPSaveFileManager::~GBAMPSaveFileManager() { } -GBAMPSaveFile* GBAMPSaveFileManager::openSavefile(char const* name, bool saveOrLoad) { +GBAMPSaveFile *GBAMPSaveFileManager::openSavefile(const char *name, bool saveOrLoad) { char fileSpec[128]; strcpy(fileSpec, getSavePath()); @@ -156,7 +156,7 @@ GBAMPSaveFile* GBAMPSaveFileManager::openSavefile(char const* name, bool saveOrL } // consolePrintf("Opening the file: %s\n", fileSpec); - GBAMPSaveFile* sf = new GBAMPSaveFile(fileSpec, saveOrLoad); + GBAMPSaveFile *sf = new GBAMPSaveFile(fileSpec, saveOrLoad); if (sf->isOpen()) { // consolePrintf("Ok"); return sf; @@ -180,7 +180,7 @@ const char *GBAMPSaveFileManager::getSavePath() const { return dir; } -Common::StringList GBAMPSaveFileManager::listSavefiles(const char *pattern) { +Common::StringList GBAMPSaveFileManager::listSavefiles(const Common::String &pattern) { enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 }; char name[256]; @@ -225,7 +225,7 @@ Common::StringList GBAMPSaveFileManager::listSavefiles(const char *pattern) { } - if (Common::matchString(name, pattern)) { + if (Common::matchString(name, pattern.c_str())) { list.push_back(name); } } @@ -236,5 +236,3 @@ Common::StringList GBAMPSaveFileManager::listSavefiles(const char *pattern) { return list; } - - diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h index c92d5d6151..e45065df42 100644 --- a/backends/platform/ds/arm9/source/gbampsave.h +++ b/backends/platform/ds/arm9/source/gbampsave.h @@ -66,13 +66,13 @@ public: GBAMPSaveFile *openSavefile(const char *filename, bool saveOrLoad); - virtual Common::OutSaveFile* openForSaving(const char* filename) { return openSavefile(filename, true); } - virtual Common::InSaveFile* openForLoading(const char* filename) { return openSavefile(filename, false); } + virtual Common::OutSaveFile* openForSaving(const Common::String &filename) { return openSavefile(filename.c_str(), true); } + virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); } - virtual bool removeSavefile(const char *filename) { return false; } // TODO: Implement this - virtual Common::StringList listSavefiles(const char *pattern); + virtual bool removeSavefile(const Common::String &filename) { return false; } // TODO: Implement this + virtual Common::StringList listSavefiles(const Common::String &pattern); - void deleteFile(char* name); + void deleteFile(const Common::String &name); void listFiles(); const char *getSavePath() const; diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp index 82830e9102..ff756205ab 100644 --- a/backends/platform/ds/arm9/source/ramsave.cpp +++ b/backends/platform/ds/arm9/source/ramsave.cpp @@ -358,9 +358,9 @@ void DSSaveFileManager::listFiles() { DSSaveFileManager* DSSaveFileManager::instancePtr = NULL; -DSSaveFile *DSSaveFileManager::openSavefile(const char* filename, bool saveOrLoad) { +DSSaveFile *DSSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) { for (int r = 0; r < 8; r++) { - if (gbaSave[r].isValid() && (gbaSave[r].matches((char *) filename))) { + if (gbaSave[r].isValid() && (gbaSave[r].matches(filename))) { // consolePrintf("Matched save %d (%d)\n", r, gbaSave[r].getSize()); gbaSave[r].reset(); //consolePrintf("reset "); @@ -384,17 +384,17 @@ DSSaveFile* DSSaveFile::clone() { return new DSSaveFile(&save, saveCompressed, saveData); } -void DSSaveFileManager::deleteFile(char* name) { +void DSSaveFileManager::deleteFile(const char* name) { // consolePrintf("Deleting %s", name); for (int r = 0; r < 8; r++) { - if (gbaSave[r].isValid() && (gbaSave[r].matches((char *) name))) { + if (gbaSave[r].isValid() && (gbaSave[r].matches(name))) { gbaSave[r].deleteFile(); } } flushToSaveRAM(); } -bool DSSaveFileManager::removeSavefile(const char *filename) { +bool DSSaveFileManager::removeSavefile(const Common::String &filename) { consolePrintf("DSSaveFileManager::removeSavefile : Not implemented yet.\n"); assert(false); //TODO: Implement this. Most likely, you just have to use the code of deleteFile? @@ -402,7 +402,7 @@ bool DSSaveFileManager::removeSavefile(const char *filename) { } -Common::StringList DSSaveFileManager::listSavefiles(const char *pattern) { +Common::StringList DSSaveFileManager::listSavefiles(const Common::String &pattern) { consolePrintf("DSSaveFileManager::listSavefiles : Not implemented yet.\n"); assert(false); return Common::StringList(); @@ -424,7 +424,7 @@ void DSSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) for (int saveNum = 0; saveNum < num; saveNum++) { for (int r = 0; r < 8; r++) { - if (gbaSave[r].isValid() && (gbaSave[r].matches((char *) prefix, saveNum))) { + if (gbaSave[r].isValid() && (gbaSave[r].matches(prefix, saveNum))) { marks[saveNum] = true; } } diff --git a/backends/platform/ds/arm9/source/ramsave.h b/backends/platform/ds/arm9/source/ramsave.h index 709b6fc6c1..47172d7844 100644 --- a/backends/platform/ds/arm9/source/ramsave.h +++ b/backends/platform/ds/arm9/source/ramsave.h @@ -122,11 +122,11 @@ public: DSSaveFile *openSavefile(const char *filename, bool saveOrLoad); - virtual Common::OutSaveFile* openForSaving(const char* filename) { return openSavefile(filename, true); } - virtual Common::InSaveFile* openForLoading(const char* filename) { return openSavefile(filename, false); } + virtual Common::OutSaveFile* openForSaving(const Common::String &filename) { return openSavefile(filename.c_str(), true); } + virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); } - virtual bool removeSavefile(const char *filename); - virtual Common::StringList listSavefiles(const char *pattern); + virtual bool removeSavefile(const Common::String &filename); + virtual Common::StringList listSavefiles(const Common::String &pattern); void flushToSaveRAM(); @@ -144,7 +144,7 @@ public: static void setExtraData(int data); protected: - DSSaveFile *makeSaveFile(const char *filename, bool saveOrLoad); + DSSaveFile *makeSaveFile(const Common::String &filename, bool saveOrLoad); }; #endif -- cgit v1.2.3