cleaned up Config::get_domain; fixed sorting in launcher

svn-id: r5541

2 files changed, 13 insertions, 15 deletions

diff --git a/common/config-file.cpp b/common/config-file.cpp
index 699c959eb0..c6289e45cf 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -245,21 +245,16 @@ const int Config::count_domains() {
 	for (d = domains.begin(); d != end; ++d)
 		count++;
 
-	return 0;
+	return count;
 }
 
-int Config::get_domains(char (*ptr)[100]) {
-	  int index = 0;
-          DomainMap::Iterator d, end(domains.end());
-          for (d = domains.begin(); d != end; ++d) {
-		//printf("Key %d is %s\n", index, d->_key.c_str());
-		strcpy(ptr[index], d->_key.c_str());
-		index++;
-
-		if (index>99)
-			return 99;
-          }
-
-	return index;
+ScummVM::StringList Config::get_domains() {
+	StringList domainNames;
+	DomainMap::Iterator d, end(domains.end());
+	for (d = domains.begin(); d != end; ++d) {
+		domainNames.push_back(d->_key);
+	}
+	
+	return domainNames;
 }
 
diff --git a/common/config-file.h b/common/config-file.h
index c581e0181d..520fb769dd 100644
--- a/common/config-file.h
+++ b/common/config-file.h
@@ -25,11 +25,13 @@
 
 #include "common/util.h"
 #include "common/map.h"
+#include "common/list.h"
 #include "common/str.h"
 
 class Config {
 public:
 	typedef ScummVM::String String;
+	typedef ScummVM::StringList StringList;
 	typedef ScummVM::StringMap StringMap;
 	typedef ScummVM::Map<String, StringMap> DomainMap;
 
@@ -52,7 +54,8 @@ public:
 	void set_writing(bool);
 
 	const int count_domains();
-	int Config::get_domains(char (*ptr)[100]);
+	StringList get_domains();
+
 protected:
 	DomainMap domains;
 	String filename;