From 1f0271a98874f2a2bae502aba1dc16782e8073f6 Mon Sep 17 00:00:00 2001
From: michaelb <michaelb@tracker.xonotic.org.invalid>
Date: Mon, 9 Apr 2012 09:44:35 +0200
Subject: [PATCH] fix invalid use of <glib/...> headers

---
 contrib/bobtoolz/lists.cpp  | 2 +-
 libs/convert.h              | 3 +--
 libs/gtkutil/cursor.h       | 2 +-
 libs/gtkutil/idledraw.h     | 2 +-
 libs/os/dir.h               | 2 +-
 plugins/shaders/shaders.cpp | 2 +-
 plugins/vfspk3/vfs.cpp      | 4 +---
 radiant/feedback.h          | 2 +-
 radiant/patch.cpp           | 2 +-
 radiant/watchbsp.cpp        | 3 +--
 tools/quake3/common/inout.c | 2 --
 11 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/contrib/bobtoolz/lists.cpp b/contrib/bobtoolz/lists.cpp
index 9b657c31..81079839 100644
--- a/contrib/bobtoolz/lists.cpp
+++ b/contrib/bobtoolz/lists.cpp
@@ -23,7 +23,7 @@
 #pragma warning(disable : 4786)
 #endif
 
-#include <glib/glist.h>
+#include <glib.h>
 
 #include "misc.h"
 
diff --git a/libs/convert.h b/libs/convert.h
index b6fe93cc..a734e6fe 100644
--- a/libs/convert.h
+++ b/libs/convert.h
@@ -27,8 +27,7 @@
 
 #include "debugging/debugging.h"
 #include <algorithm>
-#include <glib/gunicode.h>
-#include <glib/gconvert.h>
+#include <glib.h>
 
 #include "character.h"
 
diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index e1584fd0..b3cfe080 100644
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_CURSOR_H )
 #define INCLUDED_GTKUTIL_CURSOR_H
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <gdk/gdkevents.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
diff --git a/libs/gtkutil/idledraw.h b/libs/gtkutil/idledraw.h
index e74edd8c..6267951d 100644
--- a/libs/gtkutil/idledraw.h
+++ b/libs/gtkutil/idledraw.h
@@ -22,7 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_IDLEDRAW_H )
 #define INCLUDED_GTKUTIL_IDLEDRAW_H
 
-#include <glib/gmain.h>
+#include <glib.h>
 
 #include "generic/callback.h"
 
diff --git a/libs/os/dir.h b/libs/os/dir.h
index 3047a028..b1992848 100644
--- a/libs/os/dir.h
+++ b/libs/os/dir.h
@@ -25,7 +25,7 @@
 /// \file
 /// \brief OS directory-listing object.
 
-#include <glib/gdir.h>
+#include <glib.h>
 
 typedef GDir Directory;
 
diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index 37b9ebe9..54df7abc 100644
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -48,7 +48,7 @@
 #include "qerplugin.h"
 #include "irender.h"
 
-#include <glib/gslist.h>
+#include <glib.h>
 
 #include "debugging/debugging.h"
 #include "string/pooledstring.h"
diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 50bd1e4e..893f002b 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -45,9 +45,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gslist.h>
-#include <glib/gdir.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "qerplugin.h"
 #include "idatastream.h"
diff --git a/radiant/feedback.h b/radiant/feedback.h
index 94e2c7e8..04e98bb2 100644
--- a/radiant/feedback.h
+++ b/radiant/feedback.h
@@ -30,7 +30,7 @@
 
 #include "math/vector.h"
 #include "stream/stringstream.h"
-#include <glib/gstring.h>
+#include <glib.h>
 #include "xmlstuff.h"
 #include "dialog.h"
 #include "xywindow.h"
diff --git a/radiant/patch.cpp b/radiant/patch.cpp
index 1270a9e0..b31def46 100644
--- a/radiant/patch.cpp
+++ b/radiant/patch.cpp
@@ -21,7 +21,7 @@
 
 #include "patch.h"
 
-#include <glib/gslist.h>
+#include <glib.h>
 #include "preferences.h"
 #include "brush_primit.h"
 #include "signal/signal.h"
diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index c21c7ad7..f3d1ae6f 100644
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -76,8 +76,7 @@ void message_print( message_info_t* self, const char* characters, std::size_t le
 }
 
 
-#include <glib/gtimer.h>
-#include <glib/garray.h>
+#include <glib.h>
 #include "xmlstuff.h"
 
 class CWatchBSP
diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c
index 2c1758a7..14e9eaaf 100644
--- a/tools/quake3/common/inout.c
+++ b/tools/quake3/common/inout.c
@@ -44,8 +44,6 @@
 
 // utf8 conversion
 #include <glib.h>
-#include <glib/gconvert.h>
-#include <glib/gmem.h>
 
 #ifdef WIN32
 HWND hwndOut = NULL;
-- 
2.39.2