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

diff --git a/contrib/bobtoolz/lists.cpp b/contrib/bobtoolz/lists.cpp
index 9b657c3139927aa1bd59feade005cfdc17240d42..810798397d6b7cfac63542f60d41c17a8fb612a3 100644 (file)
--- 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 b6fe93cc50c74335e7bc9233f3a203c17f508c33..a734e6feb91af2f265cc5675ecdf9eade780e7b6 100644 (file)
--- 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 e1584fd00e0b2a80ac079a9a3875faa4e769a1f0..b3cfe080f8676c10ea8010ce60fb27fa01fa992f 100644 (file)
--- 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 e74edd8cfc9b834f2ccf225210c90f73031daff3..6267951d755b34a1219c3c17906c0d9bdadbfa0c 100644 (file)
--- 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 3047a0283c3f3bc8e552a7ccbd3bbe7eed318965..b1992848689c7023891c8185ce9383f89b7d2c90 100644 (file)
--- 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 37b9ebe92d38a4b45c7662cc651b7bd2076255a2..54df7abc499c4658c464d4f068bf9e2d4a49051a 100644 (file)
--- 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 50bd1e4ea0f2dd0642404e10f5c387057af79364..893f002bdf66f46351df1b5d3325347aecac9550 100644 (file)
--- 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 94e2c7e8586c8fb20851dce882c7fca3d5c3ab4e..04e98bb2d85ae26c48920caec664d13b58fd7caa 100644 (file)
--- 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 1270a9e0c7f203d13bcfd2fed2092fab27831d21..b31def460421835a87b98173fc706e21e7e24991 100644 (file)
--- 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 c21c7ad7858d27fa3f15a1396cadf05a57453815..f3d1ae6f77438bf431f3acaead01255488a17192 100644 (file)
--- 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 2c1758a76b08f35a9f96675eb20fdc320fe28e45..14e9eaafe5ffff974579c5bdd946a7a6ef46d755 100644 (file)
--- 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;