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/agi | |
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/agi')
-rw-r--r-- | engines/agi/detection.cpp | 4 | ||||
-rw-r--r-- | engines/agi/sound.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 1006d48ab7..ea980c2676 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -1048,7 +1048,7 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD SaveStateList AgiMetaEngine::listSaves(const char *target) const { const uint32 AGIflag = MKID_BE('AGI:'); Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Common::StringList filenames; + Common::StringArray filenames; char saveDesc[31]; Common::String pattern = target; pattern += ".???"; @@ -1057,7 +1057,7 @@ SaveStateList AgiMetaEngine::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 3 digits of the filename, since they correspond to the save slot int slotNum = atoi(file->c_str() + file->size() - 3); diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 24abf88c0e..6b3ecab8f0 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -1194,16 +1194,16 @@ bool IIgsSoundMgr::loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInf */ struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FSNode&, bool> { // FIXME: This should be replaced; use SearchMan instead - fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {} + fsnodeNameEqualsIgnoreCase(const Common::StringArray &str) : _str(str) {} fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); } bool operator()(const Common::FSNode ¶m) const { - for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); ++iter) + for (Common::StringArray::const_iterator iter = _str.begin(); iter != _str.end(); ++iter) if (param.getName().equalsIgnoreCase(*iter)) return true; return false; } private: - Common::StringList _str; + Common::StringArray _str; }; bool SoundMgr::loadInstruments() { @@ -1229,12 +1229,12 @@ bool SoundMgr::loadInstruments() { } // Populate executable filenames list (Long filename and short filename) for searching - Common::StringList exeNames; + Common::StringArray exeNames; exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS16"); exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS"); // Populate wave filenames list (Long filename and short filename) for searching - Common::StringList waveNames; + Common::StringArray waveNames; waveNames.push_back("SIERRASTANDARD"); waveNames.push_back("SIERRAST"); |