diff options
| author | Jonathon Jongsma <jjongsma@src.gnome.org> | 2008-12-10 14:23:33 +0000 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@src.gnome.org> | 2008-12-10 14:23:33 +0000 |
| commit | a556ef798a4ecbe69c52b9377e613deaf8c35ac7 (patch) | |
| tree | d56f666a2959ebbdc816f26c6ff475ee68aa7557 | |
| parent | 67aebc3b8b8dfe7ee6151d0c2097e25305eca3ec (diff) | |
| download | glibmm-a556ef798a4ecbe69c52b9377e613deaf8c35ac7.tar.gz | |
Clean up glib includes (Bug #563987)
svn path=/trunk/; revision=749
48 files changed, 45 insertions, 76 deletions
@@ -1,3 +1,9 @@ +2008-12-10 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com> + + * Cleaned up glib includes since in the future, only glib.h (and + glib-object.h, etc) will be allowed to be included directly. + Bug #563987 + 2008-12-01 Hubert Figuiere <hub@figuiere.net> * glib/src/markup.ccg: Change the way unused variables diff --git a/glib/glibmm/containerhandle_shared.h b/glib/glibmm/containerhandle_shared.h index 3293769f..c62b7cb5 100644 --- a/glib/glibmm/containerhandle_shared.h +++ b/glib/glibmm/containerhandle_shared.h @@ -29,7 +29,6 @@ #include <list> #include <glib-object.h> -#include <glib/gmem.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> #include <glibmm/wrap.h> diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h index f152262e..2234984a 100644 --- a/glib/glibmm/containers.h +++ b/glib/glibmm/containers.h @@ -23,8 +23,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/glist.h> -#include <glib/gslist.h> +#include <glib.h> #include <glibmm/sarray.h> /* for backward compatibility */ #include <iterator> diff --git a/glib/glibmm/debug.h b/glib/glibmm/debug.h index 556b16f8..9096d315 100644 --- a/glib/glibmm/debug.h +++ b/glib/glibmm/debug.h @@ -21,15 +21,13 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gmacros.h> +#include <glib.h> #include <glibmmconfig.h> // Some stuff that's useful when debugging gtkmm internals: #ifdef GLIBMM_DEBUG_REFCOUNTING -#include <glib/gmessages.h> - /* We can't use G_GNUC_PRETTY_FUNCTION because it's always disabled in C++, * even though __PRETTY_FUNCTION__ works fine in C++ as well if you use it * right (i.e. concatenation with string literals isn't allowed). diff --git a/glib/glibmm/error.cc b/glib/glibmm/error.cc index 49160c15..8720acf8 100644 --- a/glib/glibmm/error.cc +++ b/glib/glibmm/error.cc @@ -20,8 +20,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gerror.h> - //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0 //#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0 #include <glib.h> //For g_assert() in all versions of glib. diff --git a/glib/glibmm/error.h b/glib/glibmm/error.h index df382fb9..e131cde8 100644 --- a/glib/glibmm/error.h +++ b/glib/glibmm/error.h @@ -24,7 +24,7 @@ extern "C" { typedef struct _GError GError; } #endif -#include <glib/gquark.h> +#include <glib.h> #include <glibmm/exception.h> #include <glibmmconfig.h> //For GLIBMM_EXCEPTIONS_ENABLED diff --git a/glib/glibmm/listhandle.h b/glib/glibmm/listhandle.h index 94b366d9..fd437ed9 100644 --- a/glib/glibmm/listhandle.h +++ b/glib/glibmm/listhandle.h @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/glist.h> +#include <glib.h> #include <glibmm/containerhandle_shared.h> diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc index 997462d5..16d3f595 100644 --- a/glib/glibmm/main.cc +++ b/glib/glibmm/main.cc @@ -24,7 +24,6 @@ #include <glibmm/wrap.h> #include <glibmm/iochannel.h> -#include <glib/gmessages.h> #include <algorithm> GLIBMM_USING_STD(min) diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h index 57973602..2d0b157c 100644 --- a/glib/glibmm/main.h +++ b/glib/glibmm/main.h @@ -21,8 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/giochannel.h> -#include <glib/gmain.h> +#include <glib.h> #include <vector> #include <sigc++/sigc++.h> diff --git a/glib/glibmm/object.cc b/glib/glibmm/object.cc index b2bcce55..aea354f7 100644 --- a/glib/glibmm/object.cc +++ b/glib/glibmm/object.cc @@ -22,7 +22,6 @@ #include <glibmm/private/object_p.h> #include <glibmm/property.h> -#include <glib.h> #include <glib-object.h> #include <gobject/gvaluecollector.h> diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h index 3d7283ae..fa33b202 100644 --- a/glib/glibmm/object.h +++ b/glib/glibmm/object.h @@ -26,7 +26,7 @@ # error "X11/Xlib.h seems to have been included before this header. Due to some commonly-named macros in X11/Xlib.h, it may only be included after any glibmm, gdkmm, or gtkmm headers." #endif -#include <glib/gmacros.h> /* for G_GNUC_NULL_TERMINATED */ +#include <glib.h> /* for G_GNUC_NULL_TERMINATED */ #include <glibmm/objectbase.h> #include <glibmm/wrap.h> #include <glibmm/quark.h> diff --git a/glib/glibmm/pattern.cc b/glib/glibmm/pattern.cc index a6552595..701a35f7 100644 --- a/glib/glibmm/pattern.cc +++ b/glib/glibmm/pattern.cc @@ -20,7 +20,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gpattern.h> +#include <glib.h> #include <glibmm/pattern.h> diff --git a/glib/glibmm/quark.cc b/glib/glibmm/quark.cc index ea01f470..ceb3cba3 100644 --- a/glib/glibmm/quark.cc +++ b/glib/glibmm/quark.cc @@ -19,7 +19,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gquark.h> #include <glibmm/quark.h> namespace Glib diff --git a/glib/glibmm/quark.h b/glib/glibmm/quark.h index d2f450fe..90947c92 100644 --- a/glib/glibmm/quark.h +++ b/glib/glibmm/quark.h @@ -22,7 +22,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gquark.h> +#include <glib.h> #include <glibmm/ustring.h> diff --git a/glib/glibmm/random.cc b/glib/glibmm/random.cc index d4475616..482cb56b 100644 --- a/glib/glibmm/random.cc +++ b/glib/glibmm/random.cc @@ -21,7 +21,6 @@ */ #include <glibmm/random.h> -#include <glib/grand.h> namespace Glib diff --git a/glib/glibmm/random.h b/glib/glibmm/random.h index 4a4ce844..291045d0 100644 --- a/glib/glibmm/random.h +++ b/glib/glibmm/random.h @@ -23,7 +23,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gtypes.h> +#include <glib.h> extern "C" { typedef struct _GRand GRand; } diff --git a/glib/glibmm/signalproxy_connectionnode.h b/glib/glibmm/signalproxy_connectionnode.h index dececda2..c89ad0db 100644 --- a/glib/glibmm/signalproxy_connectionnode.h +++ b/glib/glibmm/signalproxy_connectionnode.h @@ -24,7 +24,7 @@ */ #include <sigc++/sigc++.h> -#include <glib/gtypes.h> +#include <glib.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS typedef struct _GObject GObject; diff --git a/glib/glibmm/slisthandle.h b/glib/glibmm/slisthandle.h index 7034914e..8cd16c35 100644 --- a/glib/glibmm/slisthandle.h +++ b/glib/glibmm/slisthandle.h @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gslist.h> +#include <glib.h> #include <glibmm/containerhandle_shared.h> diff --git a/glib/glibmm/timer.cc b/glib/glibmm/timer.cc index 40a7fd35..2eedbf28 100644 --- a/glib/glibmm/timer.cc +++ b/glib/glibmm/timer.cc @@ -20,7 +20,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gtimer.h> +#include <glib.h> #include <glibmm/timer.h> diff --git a/glib/glibmm/timeval.cc b/glib/glibmm/timeval.cc index 6494d0f4..f8ee3b29 100644 --- a/glib/glibmm/timeval.cc +++ b/glib/glibmm/timeval.cc @@ -20,10 +20,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gmain.h> -#include <glib/gmessages.h> -#include <glib/gtimer.h> - #include <glibmm/timeval.h> diff --git a/glib/glibmm/timeval.h b/glib/glibmm/timeval.h index f27952c2..2fbf21b9 100644 --- a/glib/glibmm/timeval.h +++ b/glib/glibmm/timeval.h @@ -23,8 +23,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gtypes.h> -#include <glib/gtimer.h> +#include <glib.h> namespace Glib { diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc index b9af58be..41323945 100644 --- a/glib/glibmm/ustring.cc +++ b/glib/glibmm/ustring.cc @@ -22,7 +22,6 @@ #include <glibmm/convert.h> #include <glibmm/error.h> #include <glibmm/utility.h> -#include <glib.h> #include <algorithm> #include <iostream> diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h index cb20655a..48782254 100644 --- a/glib/glibmm/ustring.h +++ b/glib/glibmm/ustring.h @@ -21,8 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gmacros.h> -#include <glib/gunicode.h> +#include <glib.h> #include <glibmm/unicode.h> #include <iosfwd> diff --git a/glib/glibmm/utility.cc b/glib/glibmm/utility.cc index f415bcb8..3f24b1fd 100644 --- a/glib/glibmm/utility.cc +++ b/glib/glibmm/utility.cc @@ -20,7 +20,6 @@ */ #include <glibmm/utility.h> -#include <glib/gstrfuncs.h> void Glib::append_canonical_typename(std::string& dest, const char* type_name) diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h index 0020b50a..f4c87043 100644 --- a/glib/glibmm/utility.h +++ b/glib/glibmm/utility.h @@ -20,8 +20,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gmacros.h> -#include <glib/gmem.h> +#include <glib.h> #include <glibmm/ustring.h> diff --git a/glib/glibmm/wrap.cc b/glib/glibmm/wrap.cc index 80c31be7..9f48e811 100644 --- a/glib/glibmm/wrap.cc +++ b/glib/glibmm/wrap.cc @@ -21,8 +21,7 @@ */ #include <glib-object.h> -#include <glib/gtypes.h> -#include <glib/gmacros.h> +#include <glib.h> #include <vector> #include <glibmm/object.h> diff --git a/glib/src/checksum.ccg b/glib/src/checksum.ccg index 77c776e8..c0ffd631 100644 --- a/glib/src/checksum.ccg +++ b/glib/src/checksum.ccg @@ -16,9 +16,7 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gchecksum.h> -#include <glib.h> #include <glibmm/utility.h> #include <glibmm/checksum.h> diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg index b5f2b597..1f8ef0b7 100644 --- a/glib/src/checksum.hg +++ b/glib/src/checksum.hg @@ -19,7 +19,7 @@ _DEFS(glibmm,glib) -#include <glib/gtypes.h> +#include <glib.h> #include <string> #ifndef DOXYGEN_SHOUD_SKIP_THIS diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg index 146cec5a..829009be 100644 --- a/glib/src/convert.ccg +++ b/glib/src/convert.ccg @@ -18,13 +18,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gconvert.h> - //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0 //#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0 #include <glib.h> //For g_assert() in all versions of glib. -#include <glib/gunicode.h> #include <glibmm/utility.h> diff --git a/glib/src/convert.hg b/glib/src/convert.hg index cfa326bf..1a22f259 100644 --- a/glib/src/convert.hg +++ b/glib/src/convert.hg @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: convert.hg,v 1.5 2006/05/12 08:08:44 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -19,7 +19,7 @@ _DEFS(glibmm,glib) -#include <glib/gtypes.h> /* for gsize */ +#include <glib.h> /* for gsize */ #include <glibmm/error.h> #include <glibmm/ustring.h> diff --git a/glib/src/date.ccg b/glib/src/date.ccg index 9c068e0c..fe09b501 100644 --- a/glib/src/date.ccg +++ b/glib/src/date.ccg @@ -18,8 +18,6 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gmem.h> - //#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0 //#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0 #include <glib.h> //For g_assert() in all versions of glib. diff --git a/glib/src/date.hg b/glib/src/date.hg index 83e5cf02..d3eede12 100644 --- a/glib/src/date.hg +++ b/glib/src/date.hg @@ -25,8 +25,7 @@ _DEFS(glibmm,glib) #include <glibmm/ustring.h> -#include <glib/gdate.h> -#include <glib/gtypes.h> +#include <glib.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" { struct tm; } diff --git a/glib/src/fileutils.ccg b/glib/src/fileutils.ccg index 5df5e5de..0c75bf96 100644 --- a/glib/src/fileutils.ccg +++ b/glib/src/fileutils.ccg @@ -18,9 +18,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gdir.h> -#include <glib/gfileutils.h> -#include <glib/gstrfuncs.h> +#include <glib.h> #include <glibmm/utility.h> diff --git a/glib/src/iochannel.ccg b/glib/src/iochannel.ccg index cbb206d1..a220062b 100644 --- a/glib/src/iochannel.ccg +++ b/glib/src/iochannel.ccg @@ -22,7 +22,6 @@ #include <glibmm/iochannel.h> #include <glibmm/utility.h> #include <glibmm/main.h> -#include <glib.h> namespace diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg index 049c2a39..cc44c1bd 100644 --- a/glib/src/iochannel.hg +++ b/glib/src/iochannel.hg @@ -24,7 +24,7 @@ _DEFS(glibmm,glib) #include <glibmm/main.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> -#include <glib/gtypes.h> +#include <glib.h> #include <string> #include <glibmmconfig.h> diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg index e687a24b..8ec30107 100644 --- a/glib/src/keyfile.hg +++ b/glib/src/keyfile.hg @@ -21,7 +21,7 @@ _DEFS(glibmm,glib) #include <glibmm/arrayhandle.h> #include <glibmm/error.h> #include <glibmm/utility.h> -#include <glib/gkeyfile.h> +#include <glib.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" { typedef struct _GKeyFile GKeyFile; } diff --git a/glib/src/nodetree.hg b/glib/src/nodetree.hg index adb913b5..d7cf53e6 100644 --- a/glib/src/nodetree.hg +++ b/glib/src/nodetree.hg @@ -25,8 +25,7 @@ _DEFS(glibmm,glib) #include <glibmm/ustring.h> #include <glibmm/error.h> #include <glibmm/arrayhandle.h> -#include <glib/gnode.h> -#include <glib/gtree.h> +#include <glib.h> namespace Glib { diff --git a/glib/src/optioncontext.ccg b/glib/src/optioncontext.ccg index 2fc07655..c7616247 100644 --- a/glib/src/optioncontext.ccg +++ b/glib/src/optioncontext.ccg @@ -20,7 +20,7 @@ #include <glibmm/utility.h> #include <glibmm/exceptionhandler.h> -#include <glib/goption.h> +#include <glib.h> namespace Glib { diff --git a/glib/src/optionentry.ccg b/glib/src/optionentry.ccg index 5bec3620..7d48c948 100644 --- a/glib/src/optionentry.ccg +++ b/glib/src/optionentry.ccg @@ -19,8 +19,7 @@ */ #include <glibmm/utility.h> -#include <glib/goption.h> -#include <glib/gmem.h> +#include <glib.h> namespace Glib { diff --git a/glib/src/optiongroup.ccg b/glib/src/optiongroup.ccg index c08c79a2..5a34aebf 100644 --- a/glib/src/optiongroup.ccg +++ b/glib/src/optiongroup.ccg @@ -22,8 +22,7 @@ #include <glibmm/optioncontext.h> #include <glibmm/utility.h> //#include <glibmm/containers.h> -#include <glib/gmem.h> // g_malloc -#include <glib/goption.h> +#include <glib.h> // g_malloc namespace Glib { diff --git a/glib/src/optiongroup.hg b/glib/src/optiongroup.hg index c15b80d9..fc559dbf 100644 --- a/glib/src/optiongroup.hg +++ b/glib/src/optiongroup.hg @@ -22,7 +22,7 @@ _DEFS(glibmm,glib) #include <glibmm/ustring.h> #include <map> #include <vector> -#include <glib/goption.h> //TODO: Try to hide this. +#include <glib.h> //TODO: Try to hide this. #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/glib/src/regex.hg b/glib/src/regex.hg index 5b029a8f..afc90135 100644 --- a/glib/src/regex.hg +++ b/glib/src/regex.hg @@ -21,7 +21,7 @@ _DEFS(glibmm,glib) #include <glibmm/ustring.h> #include <glibmm/error.h> #include <glibmm/arrayhandle.h> -#include <glib/gregex.h> +#include <glib.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS typedef struct _GRegex GRegex; diff --git a/glib/src/shell.hg b/glib/src/shell.hg index 3dad3e38..f81d7e5e 100644 --- a/glib/src/shell.hg +++ b/glib/src/shell.hg @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: shell.hg,v 1.2 2003/01/22 21:38:35 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -19,7 +19,7 @@ _DEFS(glibmm,glib) -#include <glib/gshell.h> +#include <glib.h> #include <string> #include <glibmm/arrayhandle.h> diff --git a/glib/src/spawn.ccg b/glib/src/spawn.ccg index c45c48e6..bce50ed7 100644 --- a/glib/src/spawn.ccg +++ b/glib/src/spawn.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id$ */ +/* $Id: spawn.ccg,v 1.8 2006/05/12 08:08:44 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -18,7 +18,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gspawn.h> +#include <glib.h> #include <glibmm/exceptionhandler.h> #include <glibmm/utility.h> diff --git a/glib/src/thread.ccg b/glib/src/thread.ccg index 962311fb..5e3ff52d 100644 --- a/glib/src/thread.ccg +++ b/glib/src/thread.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id$ */ +/* $Id: thread.ccg,v 1.9 2006/05/12 08:08:44 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -19,7 +19,7 @@ */ #include <glibmm/exceptionhandler.h> -#include <glib/gmessages.h> +#include <glib.h> namespace diff --git a/glib/src/thread.hg b/glib/src/thread.hg index b119b16c..5e689a64 100644 --- a/glib/src/thread.hg +++ b/glib/src/thread.hg @@ -19,7 +19,7 @@ _DEFS(glibmm,glib) -#include <glib/gthread.h> +#include <glib.h> #include <cstddef> #include <sigc++/sigc++.h> diff --git a/glib/src/unicode.hg b/glib/src/unicode.hg index 186ae8fc..86752938 100644 --- a/glib/src/unicode.hg +++ b/glib/src/unicode.hg @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: unicode.hg,v 1.2 2003/08/20 10:31:23 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -43,9 +43,7 @@ inline $1 $2(char c) _POP() #m4end -#include <glib/gmacros.h> -#include <glib/gstrfuncs.h> -#include <glib/gunicode.h> +#include <glib.h> // Not used, but we want to get rid of possible <ctype.h> macros. #include <cctype> diff --git a/glib/src/uriutils.ccg b/glib/src/uriutils.ccg index 3c24f0b1..be4c6cf4 100644 --- a/glib/src/uriutils.ccg +++ b/glib/src/uriutils.ccg @@ -18,7 +18,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glib/gurifuncs.h> +#include <glib.h> #include <glibmm/utility.h> namespace Glib |