COMMON: Get rid of Common::StringList

svn-id: r48287

5 files changed, 11 insertions, 11 deletions

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index b36c183895..3c526dd1cd 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -402,7 +402,7 @@ bool SciEngine::hasFeature(EngineFeature f) const {
 
 SaveStateList SciMetaEngine::listSaves(const char *target) const {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	Common::StringList filenames;
+	Common::StringArray filenames;
 	Common::String pattern = target;
 	pattern += ".???";
 
@@ -411,7 +411,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
 
 	SaveStateList saveList;
 	int slotNum = 0;
-	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
 		slotNum = atoi(file->c_str() + file->size() - 3);
 
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index bc84921367..85c4150276 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -445,7 +445,7 @@ void Kernel::loadSelectorNames() {
 	if (!r) { // No such resource?
 		// Check if we have a table for this game
 		// Some demos do not have a selector table
-		Common::StringList staticSelectorTable = checkStaticSelectorNames();
+		Common::StringArray staticSelectorTable = checkStaticSelectorNames();
 
 		if (staticSelectorTable.empty())
 			error("Kernel: Could not retrieve selector names");
@@ -722,7 +722,7 @@ bool kernel_matches_signature(SegManager *segMan, const char *sig, int argc, con
 }
 
 void Kernel::setDefaultKernelNames(Common::String gameId) {
-	_kernelNames = Common::StringList(sci_default_knames, SCI_KNAMES_DEFAULT_ENTRIES_NR);
+	_kernelNames = Common::StringArray(sci_default_knames, SCI_KNAMES_DEFAULT_ENTRIES_NR);
 
 	// Some (later) SCI versions replaced CanBeHere by CantBeHere
 	if (_selectorCache.cantBeHere != -1)
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp
index 382200355d..9d3b80a5ae 100644
--- a/engines/sci/engine/kernel32.cpp
+++ b/engines/sci/engine/kernel32.cpp
@@ -375,7 +375,7 @@ enum {
 };
 
 void Kernel::setKernelNamesSci2() {
-	_kernelNames = Common::StringList(sci2_default_knames, kKernelEntriesSci2);
+	_kernelNames = Common::StringArray(sci2_default_knames, kKernelEntriesSci2);
 }
 
 void Kernel::setKernelNamesSci21(EngineState *s) {
@@ -387,13 +387,13 @@ void Kernel::setKernelNamesSci21(EngineState *s) {
 	// they would not be compatible with other games of the same interpreter.
 
 	if (g_sci->_features->detectSci21KernelType() == SCI_VERSION_2) {
-		_kernelNames = Common::StringList(sci2_default_knames, kKernelEntriesGk2Demo);
+		_kernelNames = Common::StringArray(sci2_default_knames, kKernelEntriesGk2Demo);
 		// OnMe is IsOnMe here, but they should be compatible
 		_kernelNames[0x23] = "Robot"; // Graph in SCI2
 		_kernelNames[0x2e] = "Priority"; // DisposeTextBitmap in SCI2
 	} else {
 		// TODO: Differentiate between SCI2.1/3
-		_kernelNames = Common::StringList(sci21_default_knames, kKernelEntriesSci3);
+		_kernelNames = Common::StringArray(sci21_default_knames, kKernelEntriesSci3);
 	}
 }
 
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index e54aaee051..22abc4b193 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -257,9 +257,9 @@ void listSavegames(Common::Array<SavegameDesc> &saves) {
 	Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager();
 
 	// Load all saves
-	Common::StringList saveNames = saveFileMan->listSavefiles(g_sci->getSavegamePattern());
+	Common::StringArray saveNames = saveFileMan->listSavefiles(g_sci->getSavegamePattern());
 
-	for (Common::StringList::const_iterator iter = saveNames.begin(); iter != saveNames.end(); ++iter) {
+	for (Common::StringArray::const_iterator iter = saveNames.begin(); iter != saveNames.end(); ++iter) {
 		Common::String filename = *iter;
 		Common::SeekableReadStream *in;
 		if ((in = saveFileMan->openForLoading(filename))) {
diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp
index 6775952171..0f558f2dc8 100644
--- a/engines/sci/engine/static_selectors.cpp
+++ b/engines/sci/engine/static_selectors.cpp
@@ -110,8 +110,8 @@ static const SelectorRemap sciSelectorRemap[] = {
 	{ SCI_VERSION_NONE,             SCI_VERSION_NONE,            0,   0 }
 };
 
-Common::StringList Kernel::checkStaticSelectorNames() {
-	Common::StringList names;
+Common::StringArray Kernel::checkStaticSelectorNames() {
+	Common::StringArray names;
 	const int offset = (getSciVersion() < SCI_VERSION_1_1) ? 3 : 0;
 
 #ifdef ENABLE_SCI32