X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=contrib%2Fbobtoolz%2Flists.cpp;h=96aff1976aabe0c309917ac322b2678ae8976e8c;hp=9823b05125327d6a29e5f80c9ae6fe76dae71e3c;hb=335990b4b52a2f97a879afb68cff9bea05f05884;hpb=107765f0e4b543dfc346851ee5b4605cc17eb1c6

diff --git a/contrib/bobtoolz/lists.cpp b/contrib/bobtoolz/lists.cpp
index 9823b051..96aff197 100644
--- a/contrib/bobtoolz/lists.cpp
+++ b/contrib/bobtoolz/lists.cpp
@@ -1,21 +1,21 @@
 /*
-BobToolz plugin for GtkRadiant
-Copyright (C) 2001 Gordon Biggans
+   BobToolz plugin for GtkRadiant
+   Copyright (C) 2001 Gordon Biggans
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "lists.h"
 
@@ -23,29 +23,30 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #pragma warning(disable : 4786)
 #endif
 
-#include <glib/glist.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 #include "misc.h"
 
-bool LoadExclusionList(char* filename, std::list<Str>* exclusionList)
-{
-	FILE* eFile = fopen(filename, "r");
-	if(eFile)
-	{
+bool LoadExclusionList( char* filename, std::list<Str>* exclusionList ){
+	FILE* eFile = fopen( filename, "r" );
+	if ( eFile ) {
 		char buffer[256];
 		int cnt = 0;
-		while(!feof(eFile))
+		while ( !feof( eFile ) )
 		{
-			memset(buffer, 0, 256);
-			fscanf(eFile, "%s\n", buffer);
+			memset( buffer, 0, 256 );
+			fscanf( eFile, "%s\n", buffer );
 
-			if(strlen(buffer) > 0)
-				exclusionList->push_back(buffer);
-			else
+			if ( strlen( buffer ) > 0 ) {
+				exclusionList->push_back( buffer );
+			}
+			else{
 				cnt++;
+			}
 		}
 
-		fclose(eFile);
+		fclose( eFile );
 
 		return TRUE;
 	}
@@ -54,29 +55,29 @@ bool LoadExclusionList(char* filename, std::list<Str>* exclusionList)
 	return FALSE;
 }
 
-bool LoadGList(char* filename, GList** loadlist)
-{
-	FILE* eFile = fopen(filename, "r");
-	if(eFile)
-	{
+bool LoadGList( char* filename, ui::ListStore loadlist ){
+	FILE* eFile = fopen( filename, "r" );
+	if ( eFile ) {
 		char buffer[256];
 		int cnt = 0;
-		while(!feof(eFile))
+		while ( !feof( eFile ) )
 		{
-			memset(buffer, 0, 256);
-			fscanf(eFile, "%s\n", buffer);
-
-			if(strlen(buffer) > 0)
-			{
-				char* buffer2 = new char[strlen(buffer) + 1];
-				strcpy(buffer2, buffer);
-				*loadlist = g_list_append(*loadlist, buffer2);
+			memset( buffer, 0, 256 );
+			fscanf( eFile, "%s\n", buffer );
+
+			if ( strlen( buffer ) > 0 ) {
+				char* buffer2 = new char[strlen( buffer ) + 1];
+				strcpy( buffer2, buffer );
+				GtkTreeIter iter;
+				gtk_list_store_append(loadlist, &iter);
+				gtk_list_store_set(loadlist, &iter, 0, buffer2, -1);
 			}
-			else
+			else{
 				cnt++;
+			}
 		}
 
-		fclose(eFile);
+		fclose( eFile );
 
 		return TRUE;
 	}