aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorMax Horn2010-03-18 15:54:40 +0000
committerMax Horn2010-03-18 15:54:40 +0000
commitcac0ac66e22d18a57958ef342e6b115e35197e90 (patch)
tree1fef12f458e84cdba353bd9b3ef45e3d00a63a16 /engines/parallaction
parent81a698d0a0a52115088825523950047d135b0ca0 (diff)
downloadscummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.tar.gz
scummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.tar.bz2
scummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.zip
COMMON: Get rid of Common::StringList
svn-id: r48287
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/detection.cpp4
-rw-r--r--engines/parallaction/parallaction_ns.cpp2
-rw-r--r--engines/parallaction/saveload.cpp8
-rw-r--r--engines/parallaction/saveload.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index bda88e7812..af5fb99180 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -295,7 +295,7 @@ bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, cons
SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
- Common::StringList filenames;
+ Common::StringArray filenames;
Common::String pattern = target;
pattern += ".0??";
@@ -303,7 +303,7 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
- for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+ for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
// Obtain the last 2 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 2);
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index e271ba595e..d79e89cbc6 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -116,7 +116,7 @@ void LocationName::bind(const char *s) {
_hasSlide = false;
_hasCharacter = false;
- Common::StringList list;
+ Common::StringArray list;
char *tok = strtok(_buf, ".");
while (tok) {
list.push_back(tok);
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index cb0dccbcee..08bae50db0 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -193,9 +193,9 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
-int SaveLoad::buildSaveFileList(Common::StringList& l) {
+int SaveLoad::buildSaveFileList(Common::StringArray& l) {
Common::String pattern = _saveFilePrefix + ".???";
- Common::StringList filenames = _saveFileMan->listSavefiles(pattern);
+ Common::StringArray filenames = _saveFileMan->listSavefiles(pattern);
Common::String s;
@@ -219,7 +219,7 @@ int SaveLoad::buildSaveFileList(Common::StringList& l) {
int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button) {
- Common::StringList list;
+ Common::StringArray list;
buildSaveFileList(list);
GUI::SaveLoadChooser slc(caption, button);
@@ -332,7 +332,7 @@ static bool askRenameOldSavefiles() {
}
void SaveLoad_ns::renameOldSavefiles() {
- Common::StringList oldFilenames = _saveFileMan->listSavefiles("game.*");
+ Common::StringArray oldFilenames = _saveFileMan->listSavefiles("game.*");
uint numOldSaves = oldFilenames.size();
bool rename = false;
diff --git a/engines/parallaction/saveload.h b/engines/parallaction/saveload.h
index 3c3f4d53f9..80a2c4d8a9 100644
--- a/engines/parallaction/saveload.h
+++ b/engines/parallaction/saveload.h
@@ -42,7 +42,7 @@ protected:
Common::InSaveFile *getInSaveFile(uint slot);
Common::OutSaveFile *getOutSaveFile(uint slot);
int selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button);
- int buildSaveFileList(Common::StringList& l);
+ int buildSaveFileList(Common::StringArray& l);
virtual void doLoadGame(uint16 slot) = 0;
virtual void doSaveGame(uint16 slot, const char* name) = 0;