GNOME.org
 

glibmm r749 - in trunk: . glib/glibmm glib/src

Author: jjongsma
Date: Wed Dec 10 14:23:33 2008
New Revision: 749
URL: http://svn.gnome.org/viewvc/glibmm?rev=749&view=rev

Log:
Clean up glib includes (Bug #563987)

Modified:
   trunk/ChangeLog
   trunk/glib/glibmm/containerhandle_shared.h
   trunk/glib/glibmm/containers.h
   trunk/glib/glibmm/debug.h
   trunk/glib/glibmm/error.cc
   trunk/glib/glibmm/error.h
   trunk/glib/glibmm/listhandle.h
   trunk/glib/glibmm/main.cc
   trunk/glib/glibmm/main.h
   trunk/glib/glibmm/object.cc
   trunk/glib/glibmm/object.h
   trunk/glib/glibmm/pattern.cc
   trunk/glib/glibmm/quark.cc
   trunk/glib/glibmm/quark.h
   trunk/glib/glibmm/random.cc
   trunk/glib/glibmm/random.h
   trunk/glib/glibmm/signalproxy_connectionnode.h
   trunk/glib/glibmm/slisthandle.h
   trunk/glib/glibmm/timer.cc
   trunk/glib/glibmm/timeval.cc
   trunk/glib/glibmm/timeval.h
   trunk/glib/glibmm/ustring.cc
   trunk/glib/glibmm/ustring.h
   trunk/glib/glibmm/utility.cc
   trunk/glib/glibmm/utility.h
   trunk/glib/glibmm/wrap.cc
   trunk/glib/src/checksum.ccg
   trunk/glib/src/checksum.hg
   trunk/glib/src/convert.ccg
   trunk/glib/src/convert.hg
   trunk/glib/src/date.ccg
   trunk/glib/src/date.hg
   trunk/glib/src/fileutils.ccg
   trunk/glib/src/iochannel.ccg
   trunk/glib/src/iochannel.hg
   trunk/glib/src/keyfile.hg
   trunk/glib/src/nodetree.hg
   trunk/glib/src/optioncontext.ccg
   trunk/glib/src/optionentry.ccg
   trunk/glib/src/optiongroup.ccg
   trunk/glib/src/optiongroup.hg
   trunk/glib/src/regex.hg
   trunk/glib/src/shell.hg
   trunk/glib/src/spawn.ccg
   trunk/glib/src/thread.ccg
   trunk/glib/src/thread.hg
   trunk/glib/src/unicode.hg
   trunk/glib/src/uriutils.ccg

Modified: trunk/glib/glibmm/containerhandle_shared.h
==============================================================================
--- trunk/glib/glibmm/containerhandle_shared.h	(original)
+++ trunk/glib/glibmm/containerhandle_shared.h	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/glibmm/containers.h
==============================================================================
--- trunk/glib/glibmm/containers.h	(original)
+++ trunk/glib/glibmm/containers.h	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/glibmm/debug.h
==============================================================================
--- trunk/glib/glibmm/debug.h	(original)
+++ trunk/glib/glibmm/debug.h	Wed Dec 10 14:23:33 2008
@@ -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).

Modified: trunk/glib/glibmm/error.cc
==============================================================================
--- trunk/glib/glibmm/error.cc	(original)
+++ trunk/glib/glibmm/error.cc	Wed Dec 10 14:23:33 2008
@@ -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.

Modified: trunk/glib/glibmm/error.h
==============================================================================
--- trunk/glib/glibmm/error.h	(original)
+++ trunk/glib/glibmm/error.h	Wed Dec 10 14:23:33 2008
@@ -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
 

Modified: trunk/glib/glibmm/listhandle.h
==============================================================================
--- trunk/glib/glibmm/listhandle.h	(original)
+++ trunk/glib/glibmm/listhandle.h	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/main.cc
==============================================================================
--- trunk/glib/glibmm/main.cc	(original)
+++ trunk/glib/glibmm/main.cc	Wed Dec 10 14:23:33 2008
@@ -24,7 +24,6 @@
 #include <glibmm/wrap.h>
 #include <glibmm/iochannel.h>
 
-#include <glib/gmessages.h>
 #include <algorithm>
 
 GLIBMM_USING_STD(min)

Modified: trunk/glib/glibmm/main.h
==============================================================================
--- trunk/glib/glibmm/main.h	(original)
+++ trunk/glib/glibmm/main.h	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/glibmm/object.cc
==============================================================================
--- trunk/glib/glibmm/object.cc	(original)
+++ trunk/glib/glibmm/object.cc	Wed Dec 10 14:23:33 2008
@@ -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>
 

Modified: trunk/glib/glibmm/object.h
==============================================================================
--- trunk/glib/glibmm/object.h	(original)
+++ trunk/glib/glibmm/object.h	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/glibmm/pattern.cc
==============================================================================
--- trunk/glib/glibmm/pattern.cc	(original)
+++ trunk/glib/glibmm/pattern.cc	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/quark.cc
==============================================================================
--- trunk/glib/glibmm/quark.cc	(original)
+++ trunk/glib/glibmm/quark.cc	Wed Dec 10 14:23:33 2008
@@ -19,7 +19,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gquark.h>
 #include <glibmm/quark.h>
 
 namespace Glib

Modified: trunk/glib/glibmm/quark.h
==============================================================================
--- trunk/glib/glibmm/quark.h	(original)
+++ trunk/glib/glibmm/quark.h	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/random.cc
==============================================================================
--- trunk/glib/glibmm/random.cc	(original)
+++ trunk/glib/glibmm/random.cc	Wed Dec 10 14:23:33 2008
@@ -21,7 +21,6 @@
  */
 
 #include <glibmm/random.h>
-#include <glib/grand.h>
 
 
 namespace Glib

Modified: trunk/glib/glibmm/random.h
==============================================================================
--- trunk/glib/glibmm/random.h	(original)
+++ trunk/glib/glibmm/random.h	Wed Dec 10 14:23:33 2008
@@ -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; }
 

Modified: trunk/glib/glibmm/signalproxy_connectionnode.h
==============================================================================
--- trunk/glib/glibmm/signalproxy_connectionnode.h	(original)
+++ trunk/glib/glibmm/signalproxy_connectionnode.h	Wed Dec 10 14:23:33 2008
@@ -24,7 +24,7 @@
  */
 
 #include <sigc++/sigc++.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 typedef struct _GObject GObject;

Modified: trunk/glib/glibmm/slisthandle.h
==============================================================================
--- trunk/glib/glibmm/slisthandle.h	(original)
+++ trunk/glib/glibmm/slisthandle.h	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/timer.cc
==============================================================================
--- trunk/glib/glibmm/timer.cc	(original)
+++ trunk/glib/glibmm/timer.cc	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/timeval.cc
==============================================================================
--- trunk/glib/glibmm/timeval.cc	(original)
+++ trunk/glib/glibmm/timeval.cc	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/timeval.h
==============================================================================
--- trunk/glib/glibmm/timeval.h	(original)
+++ trunk/glib/glibmm/timeval.h	Wed Dec 10 14:23:33 2008
@@ -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
 {

Modified: trunk/glib/glibmm/ustring.cc
==============================================================================
--- trunk/glib/glibmm/ustring.cc	(original)
+++ trunk/glib/glibmm/ustring.cc	Wed Dec 10 14:23:33 2008
@@ -22,7 +22,6 @@
 #include <glibmm/convert.h>
 #include <glibmm/error.h>
 #include <glibmm/utility.h>
-#include <glib.h>
 
 #include <algorithm>
 #include <iostream>

Modified: trunk/glib/glibmm/ustring.h
==============================================================================
--- trunk/glib/glibmm/ustring.h	(original)
+++ trunk/glib/glibmm/ustring.h	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/glibmm/utility.cc
==============================================================================
--- trunk/glib/glibmm/utility.cc	(original)
+++ trunk/glib/glibmm/utility.cc	Wed Dec 10 14:23:33 2008
@@ -20,7 +20,6 @@
  */
 
 #include <glibmm/utility.h>
-#include <glib/gstrfuncs.h>
 
 
 void Glib::append_canonical_typename(std::string& dest, const char* type_name)

Modified: trunk/glib/glibmm/utility.h
==============================================================================
--- trunk/glib/glibmm/utility.h	(original)
+++ trunk/glib/glibmm/utility.h	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/glibmm/wrap.cc
==============================================================================
--- trunk/glib/glibmm/wrap.cc	(original)
+++ trunk/glib/glibmm/wrap.cc	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/src/checksum.ccg
==============================================================================
--- trunk/glib/src/checksum.ccg	(original)
+++ trunk/glib/src/checksum.ccg	Wed Dec 10 14:23:33 2008
@@ -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>
 

Modified: trunk/glib/src/checksum.hg
==============================================================================
--- trunk/glib/src/checksum.hg	(original)
+++ trunk/glib/src/checksum.hg	Wed Dec 10 14:23:33 2008
@@ -19,7 +19,7 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <string>
 
 #ifndef DOXYGEN_SHOUD_SKIP_THIS

Modified: trunk/glib/src/convert.ccg
==============================================================================
--- trunk/glib/src/convert.ccg	(original)
+++ trunk/glib/src/convert.ccg	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/src/convert.hg
==============================================================================
--- trunk/glib/src/convert.hg	(original)
+++ trunk/glib/src/convert.hg	Wed Dec 10 14:23:33 2008
@@ -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>

Modified: trunk/glib/src/date.ccg
==============================================================================
--- trunk/glib/src/date.ccg	(original)
+++ trunk/glib/src/date.ccg	Wed Dec 10 14:23:33 2008
@@ -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.

Modified: trunk/glib/src/date.hg
==============================================================================
--- trunk/glib/src/date.hg	(original)
+++ trunk/glib/src/date.hg	Wed Dec 10 14:23:33 2008
@@ -25,8 +25,7 @@
 
 #include <glibmm/ustring.h>
 
-#include <glib/gdate.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { struct tm; }

Modified: trunk/glib/src/fileutils.ccg
==============================================================================
--- trunk/glib/src/fileutils.ccg	(original)
+++ trunk/glib/src/fileutils.ccg	Wed Dec 10 14:23:33 2008
@@ -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>
 
 

Modified: trunk/glib/src/iochannel.ccg
==============================================================================
--- trunk/glib/src/iochannel.ccg	(original)
+++ trunk/glib/src/iochannel.ccg	Wed Dec 10 14:23:33 2008
@@ -22,7 +22,6 @@
 #include <glibmm/iochannel.h>
 #include <glibmm/utility.h>
 #include <glibmm/main.h>
-#include <glib.h>
 
 
 namespace

Modified: trunk/glib/src/iochannel.hg
==============================================================================
--- trunk/glib/src/iochannel.hg	(original)
+++ trunk/glib/src/iochannel.hg	Wed Dec 10 14:23:33 2008
@@ -24,7 +24,7 @@
 #include <glibmm/main.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 
 #include <string>
 #include <glibmmconfig.h>

Modified: trunk/glib/src/keyfile.hg
==============================================================================
--- trunk/glib/src/keyfile.hg	(original)
+++ trunk/glib/src/keyfile.hg	Wed Dec 10 14:23:33 2008
@@ -21,7 +21,7 @@
 #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; }

Modified: trunk/glib/src/nodetree.hg
==============================================================================
--- trunk/glib/src/nodetree.hg	(original)
+++ trunk/glib/src/nodetree.hg	Wed Dec 10 14:23:33 2008
@@ -25,8 +25,7 @@
 #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
 {

Modified: trunk/glib/src/optioncontext.ccg
==============================================================================
--- trunk/glib/src/optioncontext.ccg	(original)
+++ trunk/glib/src/optioncontext.ccg	Wed Dec 10 14:23:33 2008
@@ -20,7 +20,7 @@
 
 #include <glibmm/utility.h>
 #include <glibmm/exceptionhandler.h>
-#include <glib/goption.h>
+#include <glib.h>
 
 namespace Glib
 {

Modified: trunk/glib/src/optionentry.ccg
==============================================================================
--- trunk/glib/src/optionentry.ccg	(original)
+++ trunk/glib/src/optionentry.ccg	Wed Dec 10 14:23:33 2008
@@ -19,8 +19,7 @@
  */
 
 #include <glibmm/utility.h>
-#include <glib/goption.h>
-#include <glib/gmem.h>
+#include <glib.h>
 
 namespace Glib
 {

Modified: trunk/glib/src/optiongroup.ccg
==============================================================================
--- trunk/glib/src/optiongroup.ccg	(original)
+++ trunk/glib/src/optiongroup.ccg	Wed Dec 10 14:23:33 2008
@@ -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
 {

Modified: trunk/glib/src/optiongroup.hg
==============================================================================
--- trunk/glib/src/optiongroup.hg	(original)
+++ trunk/glib/src/optiongroup.hg	Wed Dec 10 14:23:33 2008
@@ -22,7 +22,7 @@
 #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

Modified: trunk/glib/src/regex.hg
==============================================================================
--- trunk/glib/src/regex.hg	(original)
+++ trunk/glib/src/regex.hg	Wed Dec 10 14:23:33 2008
@@ -21,7 +21,7 @@
 #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;

Modified: trunk/glib/src/shell.hg
==============================================================================
--- trunk/glib/src/shell.hg	(original)
+++ trunk/glib/src/shell.hg	Wed Dec 10 14:23:33 2008
@@ -19,7 +19,7 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib/gshell.h>
+#include <glib.h>
 #include <string>
 
 #include <glibmm/arrayhandle.h>

Modified: trunk/glib/src/spawn.ccg
==============================================================================
--- trunk/glib/src/spawn.ccg	(original)
+++ trunk/glib/src/spawn.ccg	Wed Dec 10 14:23:33 2008
@@ -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>
 

Modified: trunk/glib/src/thread.ccg
==============================================================================
--- trunk/glib/src/thread.ccg	(original)
+++ trunk/glib/src/thread.ccg	Wed Dec 10 14:23:33 2008
@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 namespace

Modified: trunk/glib/src/thread.hg
==============================================================================
--- trunk/glib/src/thread.hg	(original)
+++ trunk/glib/src/thread.hg	Wed Dec 10 14:23:33 2008
@@ -19,7 +19,7 @@
 
 _DEFS(glibmm,glib)
 
-#include <glib/gthread.h>
+#include <glib.h>
 #include <cstddef>
 
 #include <sigc++/sigc++.h>

Modified: trunk/glib/src/unicode.hg
==============================================================================
--- trunk/glib/src/unicode.hg	(original)
+++ trunk/glib/src/unicode.hg	Wed Dec 10 14:23:33 2008
@@ -43,9 +43,7 @@
 _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>

Modified: trunk/glib/src/uriutils.ccg
==============================================================================
--- trunk/glib/src/uriutils.ccg	(original)
+++ trunk/glib/src/uriutils.ccg	Wed Dec 10 14:23:33 2008
@@ -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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]