fix invalid use of <glib/...> headers

[xonotic/netradiant.git] / contrib / bobtoolz / lists.cpp

diff --git a/contrib/bobtoolz/lists.cpp b/contrib/bobtoolz/lists.cpp
index 9823b05125327d6a29e5f80c9ae6fe76dae71e3c..810798397d6b7cfac63542f60d41c17a8fb612a3 100644 (file)
--- 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,29 @@ 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 "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 +54,27 @@ 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, GList** 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 );
+                               *loadlist = g_list_append( *loadlist, buffer2 );
                        }
-                       else
+                       else{
                                cnt++;
+                       }
                }
 
-               fclose(eFile);
+               fclose( eFile );
 
                return TRUE;
        }