More include cleanups

2025-10-31 00:12:19 +01:00 · 2010-09-03 23:03:14 -04:00
parent dc2e46b2aa
commit 04077ff5c5
20 changed files with 667 additions and 614 deletions
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -22,8 +22,6 @@

 #include "config.h"

-#include "glib.h"
-
 #ifndef G_OS_WIN32
 #include <iconv.h>
 #endif
@@ -32,10 +30,6 @@
 #include <string.h>
 #include <stdlib.h>

-#include "gprintfint.h"
-#include "gthreadprivate.h"
-#include "gunicode.h"
-
 #ifdef G_OS_WIN32
 #include "win_iconv.c"
 #endif
@@ -46,6 +40,16 @@
 #undef STRICT
 #endif

+#include "gconvert.h"
+
+#include "gprintfint.h"
+#include "gslist.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
+#include "gthread.h"
+#include "gthreadprivate.h"
+#include "gunicode.h"
+
 #include "glibintl.h"

 #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -23,10 +23,10 @@
 * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GLib Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
 */

-/* 
+/*
 * MT safe ; except for g_data*_foreach()
 */

@@ -34,8 +34,13 @@

 #include <string.h>

-#include "glib.h"
+#include "gdataset.h"
+
 #include "gdatasetprivate.h"
+#include "ghash.h"
+#include "gquark.h"
+#include "gtestutils.h"
+#include "gthread.h"
 #include "glib_trace.h"

 /**
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -35,8 +35,6 @@
 /* #define DEBUG_MSG(args)	g_message args ; */
 #endif

-#include "glib.h"
-
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
@@ -46,6 +44,14 @@
 #include <windows.h>
 #endif

+#include "gdate.h"
+
+#include "gconvert.h"
+#include "gmem.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
+#include "gthread.h"
+#include "gunicode.h"

 GDate*
 g_date_new (void)
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -34,9 +34,11 @@
 #include <dirent.h>
 #endif

-#include "glib.h"
 #include "gdir.h"

+#include "gconvert.h"
+#include "gfileutils.h"
+#include "gtestutils.h"
 #include "glibintl.h"


--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -20,8 +20,6 @@

 #include "config.h"

-#include "glib.h"
-
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -49,6 +47,8 @@
 #define O_BINARY 0
 #endif

+#include "gfileutils.h"
+
 #include "gstdio.h"
 #include "glibintl.h"

--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -32,7 +32,10 @@

 #include <string.h>  /* memset */

-#include "glib.h"
+#include "ghash.h"
+
+#include "gtestutils.h"
+

 /**
 * SECTION: hash_tables
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -24,16 +24,18 @@
 * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GLib Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
 */

-/* 
+/*
 * MT safe
 */

 #include "config.h"

-#include "glib.h"
+#include "ghook.h"
+
+#include "gtestutils.h"


 /* --- functions --- */
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.c
@@ -21,16 +21,19 @@

 #include "config.h"

-#include "glib.h"
-#include "glibintl.h"
-
 #include <string.h>

+#include "ghostutils.h"
+
+#include "garray.h"
+#include "gstring.h"
+#include "gstrfuncs.h"
+#include "glibintl.h"
+

 /**
 * SECTION:ghostutils
 * @short_description: Internet hostname utilities
- * @include: glib.h
 *
 * Functions for manipulating internet hostnames; in particular, for
 * converting between Unicode and ASCII-encoded forms of
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -42,10 +42,9 @@

 #undef G_DISABLE_DEPRECATED

-#include "glib.h"
-
 #include "giochannel.h"

+#include "gtestutils.h"
 #include "glibintl.h"


--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -24,14 +24,15 @@
 * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GLib Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
 */

-/* 
+/*
 * MT safe
 */

 #include "config.h"
+#include "glibconfig.h"

 /* Uncomment the next line (and the corresponding line in gpoll.c) to
 * enable debugging printouts if the environment variable
@@ -48,8 +49,6 @@

 #define _GNU_SOURCE  /* for pipe2 */

-#include "glib.h"
-#include "gthreadprivate.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <time.h>
@@ -77,6 +76,16 @@
 #include <sys/wait.h>
 #endif

+#include "gmain.h"
+
+#include "garray.h"
+#include "giochannel.h"
+#include "ghash.h"
+#include "ghook.h"
+#include "gqueue.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
+#include "gthreadprivate.h"

 /**
 * SECTION:main
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -47,7 +47,6 @@
 #define G_MAIN_POLL_DEBUG
 #endif

-#include "glib.h"
 #include <sys/types.h>
 #include <time.h>
 #include <stdlib.h>
@@ -77,6 +76,7 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */

+#include "gpoll.h"

 #ifdef G_MAIN_POLL_DEBUG
 extern gboolean _g_main_poll_debug;
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -38,7 +38,9 @@
 #include <stdlib.h>
 #include <string.h>

-#include "glib.h"
+#include "gqsort.h"
+
+#include "gtestutils.h"

 /* Byte-wise swap two items of size SIZE. */
 #define SWAP(a, b, size)						      \
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -24,31 +24,34 @@
 * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GLib Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
 */

-/* 
+/*
 * MT safe
 */

 #include "config.h"

-#include	<errno.h>
-#include	<stdlib.h>
-#include	<stdarg.h>
-#include	<string.h>
-#include	<stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
 #ifdef HAVE_UNISTD_H
-#include	<unistd.h>
+#include <unistd.h>
 #endif

-#include	"glib.h"
-#include	"gprintfint.h"
-
 #ifdef G_OS_WIN32
-#include	<io.h>		/* For _read() */
+#include <io.h> /* For _read() */
 #endif

+#include "gscanner.h"
+
+#include "gprintfint.h"
+#include "gstring.h"
+#include "gtestutils.h"
+
 /* --- defines --- */
 #define	to_lower(c)				( \
 	(guchar) (							\
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -24,12 +24,11 @@

 #include <string.h>

-#include "glib.h"
-
-#ifdef _
-#warning "FIXME remove gettext hack"
-#endif
+#include "gshell.h"

+#include "gslist.h"
+#include "gstring.h"
+#include "gtestutils.h"
 #include "glibintl.h"

 /**
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -22,8 +22,6 @@

 #define G_STDIO_NO_WRAP_ON_UNIX

-#include "glib.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -26,7 +26,12 @@

 #include "config.h"

-#include "glib.h"
+#include "gthreadpool.h"
+
+#include "gasyncqueue.h"
+#include "gmain.h"
+#include "gtestutils.h"
+#include "gtimer.h"

 /**
 * SECTION: thread_pools
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -21,10 +21,10 @@
 * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GLib Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
 */

-/* 
+/*
 * MT safe
 */

@@ -47,7 +47,11 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */

-#include "glib.h"
+#include "gtimer.h"
+
+#include "gmem.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
 #include "gthread.h"

 /**
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -30,8 +30,13 @@
 #include <CoreServices/CoreServices.h>
 #endif

-#include "glib.h"
+#include "gmem.h"
+#include "gunicode.h"
 #include "gunicodeprivate.h"
+#include "gstring.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
+

 #ifdef _MSC_VER
 /* Workaround for bug in MSVCR80.DLL */
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -26,7 +26,11 @@
 #include <string.h>
 #include <locale.h>

-#include "glib.h"
+#include "gmem.h"
+#include "gstring.h"
+#include "gtestutils.h"
+#include "gtypes.h"
+#include "gunicode.h"
 #include "gunichartables.h"
 #include "gmirroringtable.h"
 #include "gscripttable.h"