[Scummvm-cvs-logs] SF.net SVN: scummvm:[48286] scummvm/trunk/backends
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Mar 18 16:44:59 CET 2010
Revision: 48286
http://scummvm.svn.sourceforge.net/scummvm/?rev=48286&view=rev
Author: fingolfin
Date: 2010-03-18 15:44:59 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Convert some occurences of StringList to StringArray;
try to fix compile error in GP2x code
Modified Paths:
--------------
scummvm/trunk/backends/platform/dc/vmsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h
scummvm/trunk/backends/platform/gp2x/graphics.cpp
scummvm/trunk/backends/platform/n64/framfs_save_manager.cpp
scummvm/trunk/backends/platform/n64/framfs_save_manager.h
scummvm/trunk/backends/platform/n64/pakfs_save_manager.cpp
scummvm/trunk/backends/platform/n64/pakfs_save_manager.h
scummvm/trunk/backends/platform/ps2/savefilemgr.cpp
scummvm/trunk/backends/platform/ps2/savefilemgr.h
scummvm/trunk/backends/plugins/dc/dc-provider.h
scummvm/trunk/backends/plugins/psp/psp-provider.h
scummvm/trunk/backends/plugins/win32/win32-provider.h
scummvm/trunk/backends/saves/default/default-saves.cpp
scummvm/trunk/backends/saves/default/default-saves.h
Modified: scummvm/trunk/backends/platform/dc/vmsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/vmsave.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/dc/vmsave.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -189,7 +189,7 @@
return !*name;
}
-static void tryList(const char *glob, int vm, Common::StringList &list)
+static void tryList(const char *glob, int vm, Common::StringArray &list)
{
struct vmsinfo info;
struct superblock super;
@@ -335,7 +335,7 @@
return ::deleteSaveGame(filename.c_str());
}
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
};
void OutVMSave::finalize()
@@ -420,9 +420,9 @@
}
-Common::StringList VMSaveManager::listSavefiles(const Common::String &pattern)
+Common::StringArray VMSaveManager::listSavefiles(const Common::String &pattern)
{
- Common::StringList list;
+ Common::StringArray list;
for (int i=0; i<24; i++)
tryList(pattern.c_str(), i, list);
Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -180,7 +180,7 @@
return dir;
}
-Common::StringList GBAMPSaveFileManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray GBAMPSaveFileManager::listSavefiles(const Common::String &pattern) {
enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 };
char name[256];
@@ -212,7 +212,7 @@
int fileType = FAT_FindFirstFileLFN(name);
- Common::StringList list;
+ Common::StringArray list;
do {
Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -70,7 +70,7 @@
virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); }
virtual bool removeSavefile(const Common::String &filename) { return false; } // TODO: Implement this
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
void deleteFile(const Common::String &name);
void listFiles();
Modified: scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -402,10 +402,10 @@
}
-Common::StringList DSSaveFileManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray DSSaveFileManager::listSavefiles(const Common::String &pattern) {
consolePrintf("DSSaveFileManager::listSavefiles : Not implemented yet.\n");
assert(false);
- return Common::StringList();
+ return Common::StringArray();
/*
TODO: Implement this. If you don't understand what it should do, just ask
(e.g. on scummvm-devel or Fingolfin). It should be pretty simple if you
Modified: scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -126,7 +126,7 @@
virtual Common::InSaveFile* openForLoading(const Common::String &filename) { return openSavefile(filename.c_str(), false); }
virtual bool removeSavefile(const Common::String &filename);
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
void flushToSaveRAM();
Modified: scummvm/trunk/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/graphics.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/gp2x/graphics.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -31,6 +31,7 @@
#include "backends/platform/gp2x/gp2x-common.h"
#include "common/util.h"
#include "common/mutex.h"
+#include "common/str-array.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
#include "graphics/scaler.h"
@@ -1642,7 +1643,7 @@
SDL_FillRect(_osdSurface, 0, kOSDColorKey);
// Split the message into separate lines.
- Common::StringList lines;
+ Common::StringArray lines;
const char *ptr;
for (ptr = msg; *ptr; ++ptr) {
if (*ptr == '\n') {
Modified: scummvm/trunk/backends/platform/n64/framfs_save_manager.cpp
===================================================================
--- scummvm/trunk/backends/platform/n64/framfs_save_manager.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/n64/framfs_save_manager.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -53,10 +53,10 @@
return framfs_write(buf, 1, cnt, fd);
}
-Common::StringList FRAMSaveManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray FRAMSaveManager::listSavefiles(const Common::String &pattern) {
FRAMDIR *dirp = framfs_opendir();
framfs_dirent *dp;
- Common::StringList list;
+ Common::StringArray list;
Common::String *fname;
while ((dp = framfs_readdir(dirp)) != NULL) {
Modified: scummvm/trunk/backends/platform/n64/framfs_save_manager.h
===================================================================
--- scummvm/trunk/backends/platform/n64/framfs_save_manager.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/n64/framfs_save_manager.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -127,7 +127,7 @@
return ::fram_deleteSaveGame(filename.c_str());
}
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
};
Modified: scummvm/trunk/backends/platform/n64/pakfs_save_manager.cpp
===================================================================
--- scummvm/trunk/backends/platform/n64/pakfs_save_manager.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/n64/pakfs_save_manager.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -54,10 +54,10 @@
return pakfs_write(buf, 1, cnt, fd);
}
-Common::StringList PAKSaveManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray PAKSaveManager::listSavefiles(const Common::String &pattern) {
PAKDIR *dirp = pakfs_opendir();
pakfs_dirent *dp;
- Common::StringList list;
+ Common::StringArray list;
Common::String *fname;
while ((dp = pakfs_readdir(dirp)) != NULL) {
Modified: scummvm/trunk/backends/platform/n64/pakfs_save_manager.h
===================================================================
--- scummvm/trunk/backends/platform/n64/pakfs_save_manager.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/n64/pakfs_save_manager.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -128,7 +128,7 @@
return ::pakfs_deleteSaveGame(filename.c_str());
}
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
};
Modified: scummvm/trunk/backends/platform/ps2/savefilemgr.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/savefilemgr.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ps2/savefilemgr.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -228,7 +228,7 @@
return true;
}
-Common::StringList Ps2SaveFileManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray Ps2SaveFileManager::listSavefiles(const Common::String &pattern) {
Common::FSNode savePath(ConfMan.get("savepath")); // TODO: is this fast?
Common::String _dir;
Common::String search;
@@ -237,7 +237,7 @@
char *game=0, path[32], temp[32];
if (!savePath.exists() || !savePath.isDirectory())
- return Common::StringList();
+ return Common::StringArray();
printf("listSavefiles = %s\n", pattern.c_str());
@@ -260,7 +260,7 @@
Common::FSDirectory dir(_dir);
Common::ArchiveMemberList savefiles;
- Common::StringList results;
+ Common::StringArray results;
printf("dir = %s --- reg = %s\n", _dir.c_str(), search.c_str());
Modified: scummvm/trunk/backends/platform/ps2/savefilemgr.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/savefilemgr.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/platform/ps2/savefilemgr.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -39,7 +39,7 @@
virtual Common::InSaveFile *openForLoading(const Common::String &filename);
virtual Common::OutSaveFile *openForSaving(const Common::String &filename);
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
virtual bool removeSavefile(const Common::String &filename);
// void writeSaveNonblocking(char *name, void *buf, uint32 size);
Modified: scummvm/trunk/backends/plugins/dc/dc-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/dc/dc-provider.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/plugins/dc/dc-provider.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -36,7 +36,7 @@
bool isPluginFilename(const Common::FSNode &node) const;
- virtual void addCustomDirectories(Common::StringList &dirs) const {
+ virtual void addCustomDirectories(Common::StringArray &dirs) const {
dirs.push_back("/");
}
};
Modified: scummvm/trunk/backends/plugins/psp/psp-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/psp/psp-provider.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/plugins/psp/psp-provider.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -36,7 +36,7 @@
bool isPluginFilename(const Common::FSNode &node) const;
- virtual void addCustomDirectories(Common::StringList &dirs) const {
+ virtual void addCustomDirectories(Common::StringArray &dirs) const {
dirs.push_back("/");
}
};
Modified: scummvm/trunk/backends/plugins/win32/win32-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/win32/win32-provider.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/plugins/win32/win32-provider.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -36,7 +36,7 @@
bool isPluginFilename(const Common::FSNode &node) const;
- virtual void addCustomDirectories(Common::StringList &dirs) const {}
+ virtual void addCustomDirectories(Common::StringArray &dirs) const {}
};
#endif // defined(DYNAMIC_MODULES) && defined(_WIN32)
Modified: scummvm/trunk/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.cpp 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/saves/default/default-saves.cpp 2010-03-18 15:44:59 UTC (rev 48286)
@@ -54,18 +54,18 @@
}
}
-Common::StringList DefaultSaveFileManager::listSavefiles(const Common::String &pattern) {
+Common::StringArray DefaultSaveFileManager::listSavefiles(const Common::String &pattern) {
Common::String savePathName = getSavePath();
checkPath(Common::FSNode(savePathName));
if (getError() != Common::kNoError)
- return Common::StringList();
+ return Common::StringArray();
// recreate FSNode since checkPath may have changed/created the directory
Common::FSNode savePath(savePathName);
Common::FSDirectory dir(savePath);
Common::ArchiveMemberList savefiles;
- Common::StringList results;
+ Common::StringArray results;
Common::String search(pattern);
if (dir.listMatchingMembers(savefiles, search) > 0) {
Modified: scummvm/trunk/backends/saves/default/default-saves.h
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.h 2010-03-18 15:39:56 UTC (rev 48285)
+++ scummvm/trunk/backends/saves/default/default-saves.h 2010-03-18 15:44:59 UTC (rev 48286)
@@ -39,7 +39,7 @@
DefaultSaveFileManager();
DefaultSaveFileManager(const Common::String &defaultSavepath);
- virtual Common::StringList listSavefiles(const Common::String &pattern);
+ virtual Common::StringArray listSavefiles(const Common::String &pattern);
virtual Common::InSaveFile *openForLoading(const Common::String &filename);
virtual Common::OutSaveFile *openForSaving(const Common::String &filename);
virtual bool removeSavefile(const Common::String &filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list