[Scummvm-cvs-logs] CVS: scummvm/common config-file.cpp,1.7,1.8 config-file.h,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv7411/common

Modified Files:
	config-file.cpp config-file.h 
Log Message:
cleaned up Config::get_domain; fixed sorting in launcher

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config-file.cpp	28 Oct 2002 09:03:01 -0000	1.7
+++ config-file.cpp	13 Nov 2002 20:23:24 -0000	1.8
@@ -245,21 +245,16 @@
 	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;
 }
 

Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config-file.h	28 Oct 2002 09:03:01 -0000	1.5
+++ config-file.h	13 Nov 2002 20:23:24 -0000	1.6
@@ -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 @@
 	void set_writing(bool);
 
 	const int count_domains();
-	int Config::get_domains(char (*ptr)[100]);
+	StringList get_domains();
+
 protected:
 	DomainMap domains;
 	String filename;