diff options
author | Max Horn | 2010-03-18 15:54:40 +0000 |
---|---|---|
committer | Max Horn | 2010-03-18 15:54:40 +0000 |
commit | cac0ac66e22d18a57958ef342e6b115e35197e90 (patch) | |
tree | 1fef12f458e84cdba353bd9b3ef45e3d00a63a16 /engines/queen | |
parent | 81a698d0a0a52115088825523950047d135b0ca0 (diff) | |
download | scummvm-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/queen')
-rw-r--r-- | engines/queen/queen.cpp | 8 | ||||
-rw-r--r-- | engines/queen/resource.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 7c351842c4..29d9452f4c 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -141,7 +141,7 @@ GameList QueenMetaEngine::detectGames(const Common::FSList &fslist) const { SaveStateList QueenMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Common::StringList filenames; + Common::StringArray filenames; char saveDesc[32]; Common::String pattern("queen.s??"); @@ -149,7 +149,7 @@ SaveStateList QueenMetaEngine::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); @@ -432,8 +432,8 @@ int QueenEngine::getGameStateSlot(const char *filename) const { void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) { char prefix[20]; makeGameStateName(SLOT_LISTPREFIX, prefix); - Common::StringList filenames = _saveFileMan->listSavefiles(prefix); - for (Common::StringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) { + Common::StringArray filenames = _saveFileMan->listSavefiles(prefix); + for (Common::StringArray::const_iterator it = filenames.begin(); it != filenames.end(); ++it) { int i = getGameStateSlot(it->c_str()); if (i >= 0 && i < SAVESTATE_MAX_NUM) { GameStateHeader header; diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index 9fa62eee27..fda12eb7c5 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -125,7 +125,7 @@ uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, uint32 *size) return dstBuf; } -void Resource::loadTextFile(const char *filename, Common::StringList &stringList) { +void Resource::loadTextFile(const char *filename, Common::StringArray &stringList) { debug(7, "Resource::loadTextFile('%s')", filename); ResourceEntry *re = resourceEntry(filename); assert(re != NULL); |