diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-10-24 13:26:17 -0400 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-10-25 11:01:30 +0200 |
| commit | 57942f6c2b1e15b7676d2fb24da71475be73a45f (patch) | |
| tree | 8f64df63f219cd6fd4e855aa5112199d7d90a07d | |
| parent | c27085033cefd302300bb1e330637a17293f26bf (diff) | |
| download | glibmm-57942f6c2b1e15b7676d2fb24da71475be73a45f.tar.gz | |
gmmproc: Don't include <glibmm.h> by default in generated files.
* tools/m4/base.m4: Include <glibmm/ustring.h> and <sigc++/sigc++.h>
by default in header files of generated files in modules other than
glibmm. This should make compilation faster for those modules.
* gio/src/*.{h,cc}g:
* gio/giomm/slot_async.cc: Adjust includes according to the above
change.
Bug #662597
75 files changed, 139 insertions, 3 deletions
@@ -1,3 +1,17 @@ +2011-10-24 José Alburquerque <jaalburqu@svn.gnome.org> + + gmmproc: Don't include <glibmm.h> by default in generated files. + + * tools/m4/base.m4: Include <glibmm/ustring.h> and <sigc++/sigc++.h> + by default in header files of generated files in modules other than + glibmm. This should make compilation faster for those modules. + + * gio/src/*.{h,cc}g: + * gio/giomm/slot_async.cc: Adjust includes according to the above + change. + + Bug #662597 + 2.31.0: 2011-10-25 Murray Cumming <murrayc@murrayc.com> diff --git a/gio/giomm/slot_async.cc b/gio/giomm/slot_async.cc index e51601fd..8db82bc8 100644 --- a/gio/giomm/slot_async.cc +++ b/gio/giomm/slot_async.cc @@ -16,7 +16,9 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include "slot_async.h" +#include <glibmm/exceptionhandler.h> #include <giomm/asyncresult.h> namespace Gio diff --git a/gio/src/action.ccg b/gio/src/action.ccg index c8c78857..d3dd74a3 100644 --- a/gio/src/action.ccg +++ b/gio/src/action.ccg @@ -17,6 +17,8 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/exceptionhandler.h> +#include <glibmm/variant.h> #include <gio/gio.h> namespace Gio diff --git a/gio/src/action.hg b/gio/src/action.hg index 3ac61ca2..88694f7a 100644 --- a/gio/src/action.hg +++ b/gio/src/action.hg @@ -28,6 +28,13 @@ _PINCLUDE(gio/gio.h) typedef struct _GActionInterface GActionInterface; #endif /* DOXYGEN_SHOULD_SKIP_THIS */ +namespace Glib +{ + +class VariantBase; + +} + namespace Gio { diff --git a/gio/src/actiongroup.ccg b/gio/src/actiongroup.ccg index 555a34bc..35feb3a5 100644 --- a/gio/src/actiongroup.ccg +++ b/gio/src/actiongroup.ccg @@ -17,6 +17,9 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/exceptionhandler.h> +#include <glibmm/variant.h> +#include <glibmm/vectorutils.h> #include <gio/gio.h> namespace Gio diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg index c3853091..e6c2fddd 100644 --- a/gio/src/actiongroup.hg +++ b/gio/src/actiongroup.hg @@ -18,6 +18,7 @@ */ #include <glibmm/interface.h> +#include <glibmm/varianttype.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/interface_p.h) @@ -27,6 +28,14 @@ _PINCLUDE(gio/gio.h) typedef struct _GActionGroupInterface GActionGroupInterface; #endif /* DOXYGEN_SHOULD_SKIP_THIS */ +namespace Glib +{ + +class VariantBase; +class VariantContainerBase; + +} + namespace Gio { diff --git a/gio/src/appinfo.ccg b/gio/src/appinfo.ccg index f237a633..fc8d0183 100644 --- a/gio/src/appinfo.ccg +++ b/gio/src/appinfo.ccg @@ -17,8 +17,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <gio/gio.h> #include <giomm/file.h> +#include <glibmm/listhandle.h> +#include <glibmm/vectorutils.h> +#include <gio/gio.h> namespace Gio { diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg index 20689a61..ebf93c6f 100644 --- a/gio/src/appinfo.hg +++ b/gio/src/appinfo.hg @@ -22,6 +22,7 @@ #include <string> #include <glibmm/interface.h> +#include <glibmm/listhandle.h> #include <glibmm/object.h> //#include <giomm/file.h> #include <giomm/icon.h> diff --git a/gio/src/applicationcommandline.ccg b/gio/src/applicationcommandline.ccg index 4e41294e..8cc2b062 100644 --- a/gio/src/applicationcommandline.ccg +++ b/gio/src/applicationcommandline.ccg @@ -16,6 +16,7 @@ */ #include <gio/gio.h> +#include <glibmm/vectorutils.h> namespace Gio { diff --git a/gio/src/asyncinitable.ccg b/gio/src/asyncinitable.ccg index 4dc8d8a3..882f780e 100644 --- a/gio/src/asyncinitable.ccg +++ b/gio/src/asyncinitable.ccg @@ -18,6 +18,8 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> +#include <glibmm/exceptionhandler.h> #include <giomm/cancellable.h> #include "slot_async.h" diff --git a/gio/src/asyncinitable.hg b/gio/src/asyncinitable.hg index 973341eb..d12fddfc 100644 --- a/gio/src/asyncinitable.hg +++ b/gio/src/asyncinitable.hg @@ -18,6 +18,7 @@ */ #include <glibmm/interface.h> +#include <glibmm/priorities.h> #include <giomm/asyncresult.h> _DEFS(giomm,gio) diff --git a/gio/src/asyncresult.ccg b/gio/src/asyncresult.ccg index 0094868d..9697606e 100644 --- a/gio/src/asyncresult.ccg +++ b/gio/src/asyncresult.ccg @@ -19,6 +19,7 @@ //#include <gio/gasyncresult.h> //We are not allowed to include individual headers. #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg index ab4cd416..abfccda1 100644 --- a/gio/src/bufferedinputstream.ccg +++ b/gio/src/bufferedinputstream.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include "slot_async.h" namespace Gio diff --git a/gio/src/cancellable.ccg b/gio/src/cancellable.ccg index b9b07231..3c5d8eef 100644 --- a/gio/src/cancellable.ccg +++ b/gio/src/cancellable.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/credentials.ccg b/gio/src/credentials.ccg index 555a34bc..ed04a994 100644 --- a/gio/src/credentials.ccg +++ b/gio/src/credentials.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> namespace Gio { diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg index 69e3b40e..f71c8f71 100644 --- a/gio/src/datainputstream.ccg +++ b/gio/src/datainputstream.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include "slot_async.h" namespace Gio diff --git a/gio/src/dataoutputstream.ccg b/gio/src/dataoutputstream.ccg index 0dfae52c..fe7f96ac 100644 --- a/gio/src/dataoutputstream.ccg +++ b/gio/src/dataoutputstream.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> namespace Gio { diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg index fc45f593..2fe11d9b 100644 --- a/gio/src/dbusaddress.ccg +++ b/gio/src/dbusaddress.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include "slot_async.h" namespace Gio diff --git a/gio/src/dbusauthobserver.ccg b/gio/src/dbusauthobserver.ccg index 7e96b87d..5a181e47 100644 --- a/gio/src/dbusauthobserver.ccg +++ b/gio/src/dbusauthobserver.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> #include <giomm/credentials.h> //To help the generated code: diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg index cb05bca7..48432186 100644 --- a/gio/src/dbusconnection.ccg +++ b/gio/src/dbusconnection.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> #include <giomm/dbusauthobserver.h> #include <giomm/dbusintrospection.h> #include <giomm/dbusmethodinvocation.h> diff --git a/gio/src/dbuserror.hg b/gio/src/dbuserror.hg index 0828ebff..96f411f7 100644 --- a/gio/src/dbuserror.hg +++ b/gio/src/dbuserror.hg @@ -17,8 +17,9 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/error.h> + _DEFS(giomm,gio) -_PINCLUDE(glibmm/private/interface_p.h) namespace Gio { diff --git a/gio/src/dbuserrorutils.ccg b/gio/src/dbuserrorutils.ccg index 0744aaad..a5db2cec 100644 --- a/gio/src/dbuserrorutils.ccg +++ b/gio/src/dbuserrorutils.ccg @@ -18,6 +18,8 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> +#include <glibmm/utility.h> namespace Gio { diff --git a/gio/src/dbuserrorutils.hg b/gio/src/dbuserrorutils.hg index 7ec998c0..00b576a0 100644 --- a/gio/src/dbuserrorutils.hg +++ b/gio/src/dbuserrorutils.hg @@ -19,6 +19,13 @@ _DEFS(giomm,gio) +namespace Glib +{ + +class Error; + +} + namespace Gio { diff --git a/gio/src/dbusinterfacevtable.ccg b/gio/src/dbusinterfacevtable.ccg index 4db46a2d..d750b5cf 100644 --- a/gio/src/dbusinterfacevtable.ccg +++ b/gio/src/dbusinterfacevtable.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> #include <giomm/dbusauthobserver.h> #include <giomm/dbusintrospection.h> #include <giomm/dbusmethodinvocation.h> diff --git a/gio/src/dbusintrospection.ccg b/gio/src/dbusintrospection.ccg index 77638e39..cd6c2971 100644 --- a/gio/src/dbusintrospection.ccg +++ b/gio/src/dbusintrospection.ccg @@ -17,6 +17,9 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/error.h> +#include <glibmm/utility.h> + namespace Gio { diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg index 442cfb8d..1eb9d637 100644 --- a/gio/src/dbusintrospection.hg +++ b/gio/src/dbusintrospection.hg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/arrayhandle.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) diff --git a/gio/src/dbusmessage.ccg b/gio/src/dbusmessage.ccg index ea701aef..1e97e017 100644 --- a/gio/src/dbusmessage.ccg +++ b/gio/src/dbusmessage.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #ifdef G_OS_UNIX #include <giomm/unixfdlist.h> diff --git a/gio/src/dbusmethodinvocation.ccg b/gio/src/dbusmethodinvocation.ccg index ca113ed2..02c2c656 100644 --- a/gio/src/dbusmethodinvocation.ccg +++ b/gio/src/dbusmethodinvocation.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/dbusconnection.h> #include <giomm/dbusmessage.h> #include <giomm/dbusintrospection.h> diff --git a/gio/src/dbusmethodinvocation.hg b/gio/src/dbusmethodinvocation.hg index 72ecb730..84fecef5 100644 --- a/gio/src/dbusmethodinvocation.hg +++ b/gio/src/dbusmethodinvocation.hg @@ -26,6 +26,13 @@ _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) +namespace Glib +{ + +class Error; + +} + namespace Gio { diff --git a/gio/src/dbusownname.ccg b/gio/src/dbusownname.ccg index bdadb280..d295247d 100644 --- a/gio/src/dbusownname.ccg +++ b/gio/src/dbusownname.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace { diff --git a/gio/src/dbusproxy.ccg b/gio/src/dbusproxy.ccg index 3d3cb453..a97fc49c 100644 --- a/gio/src/dbusproxy.ccg +++ b/gio/src/dbusproxy.ccg @@ -18,6 +18,9 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> +#include <glibmm/exceptionhandler.h> +#include <glibmm/vectorutils.h> #include <giomm/asyncresult.h> #include <giomm/dbusconnection.h> #include <giomm/dbusintrospection.h> diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg index 1d0c45d8..9454bf2c 100644 --- a/gio/src/dbusserver.ccg +++ b/gio/src/dbusserver.ccg @@ -18,6 +18,8 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> +#include <glibmm/exceptionhandler.h> #include <giomm/dbusconnection.h> #include <giomm/dbusauthobserver.h> diff --git a/gio/src/dbussubtreevtable.ccg b/gio/src/dbussubtreevtable.ccg index 912c4ea6..a2481012 100644 --- a/gio/src/dbussubtreevtable.ccg +++ b/gio/src/dbussubtreevtable.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> #include <giomm/dbusauthobserver.h> #include <giomm/dbusintrospection.h> #include <giomm/dbusmethodinvocation.h> diff --git a/gio/src/dbusutils.ccg b/gio/src/dbusutils.ccg index 3967fce3..195b73c5 100644 --- a/gio/src/dbusutils.ccg +++ b/gio/src/dbusutils.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/utility.h> namespace Gio { diff --git a/gio/src/dbuswatchname.ccg b/gio/src/dbuswatchname.ccg index 7c36e611..ca9947bb 100644 --- a/gio/src/dbuswatchname.ccg +++ b/gio/src/dbuswatchname.ccg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/exceptionhandler.h> #include <gio/gio.h> namespace diff --git a/gio/src/desktopappinfo.ccg b/gio/src/desktopappinfo.ccg index 1d83d1f5..42cfd45c 100644 --- a/gio/src/desktopappinfo.ccg +++ b/gio/src/desktopappinfo.ccg @@ -19,3 +19,4 @@ #include <gio/gio.h> #include <gio/gdesktopappinfo.h> +#include <glibmm/keyfile.h> diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg index c57c03f5..7ef0c294 100644 --- a/gio/src/desktopappinfo.hg +++ b/gio/src/desktopappinfo.hg @@ -23,6 +23,13 @@ _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) +namespace Glib +{ + +class KeyFile; + +} + namespace Gio { diff --git a/gio/src/drive.hg b/gio/src/drive.hg index 872dd4d4..020f2ffc 100644 --- a/gio/src/drive.hg +++ b/gio/src/drive.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/listhandle.h> #include <giomm/mount.h> #include <giomm/icon.h> //#include <giomm/volume.h> diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg index 86e0d989..707cce59 100644 --- a/gio/src/emblemedicon.hg +++ b/gio/src/emblemedicon.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/listhandle.h> #include <glibmm/object.h> #include <giomm/icon.h> #include <giomm/emblem.h> diff --git a/gio/src/enums.hg b/gio/src/enums.hg index bca0414a..1c48dc53 100644 --- a/gio/src/enums.hg +++ b/gio/src/enums.hg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/value.h> _DEFS(giomm,gio) diff --git a/gio/src/error.hg b/gio/src/error.hg index 65bb1c8f..2381fe59 100644 --- a/gio/src/error.hg +++ b/gio/src/error.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/error.h> #include <glibmm/interface.h> // There have been issues with other libraries defining HOST_NOT_FOUND (e.g. diff --git a/gio/src/fileenumerator.hg b/gio/src/fileenumerator.hg index 3ce9b896..8d705629 100644 --- a/gio/src/fileenumerator.hg +++ b/gio/src/fileenumerator.hg @@ -20,6 +20,7 @@ #include <glibmm/object.h> #include <glibmm/arrayhandle.h> #include <glibmm/listhandle.h> +#include <glibmm/priorities.h> #include <giomm/asyncresult.h> #include <giomm/cancellable.h> #include <giomm/fileinfo.h> diff --git a/gio/src/filemonitor.ccg b/gio/src/filemonitor.ccg index 996ac32d..45b0d1ae 100644 --- a/gio/src/filemonitor.ccg +++ b/gio/src/filemonitor.ccg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/exceptionhandler.h> #include <giomm/file.h> #include <gio/gio.h> diff --git a/gio/src/filenamecompleter.ccg b/gio/src/filenamecompleter.ccg index 996ac32d..45b0d1ae 100644 --- a/gio/src/filenamecompleter.ccg +++ b/gio/src/filenamecompleter.ccg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/exceptionhandler.h> #include <giomm/file.h> #include <gio/gio.h> diff --git a/gio/src/filenamecompleter.hg b/gio/src/filenamecompleter.hg index 7b7e5a2d..39108562 100644 --- a/gio/src/filenamecompleter.hg +++ b/gio/src/filenamecompleter.hg @@ -18,6 +18,7 @@ */ //#include <giomm/file.h> +#include <glibmm/arrayhandle.h> #include <glibmm/object.h> _DEFS(giomm,gio) diff --git a/gio/src/icon.ccg b/gio/src/icon.ccg index cbf860b1..7b77fa4c 100644 --- a/gio/src/icon.ccg +++ b/gio/src/icon.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> namespace Gio { diff --git a/gio/src/initable.ccg b/gio/src/initable.ccg index 173a7099..e58c2ed7 100644 --- a/gio/src/initable.ccg +++ b/gio/src/initable.ccg @@ -18,6 +18,8 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/inputstream.ccg b/gio/src/inputstream.ccg index 9b1eeebc..8cdd3ff8 100644 --- a/gio/src/inputstream.ccg +++ b/gio/src/inputstream.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/asyncresult.h> #include "slot_async.h" diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg index 427d447b..c370fdd8 100644 --- a/gio/src/inputstream.hg +++ b/gio/src/inputstream.hg @@ -18,6 +18,7 @@ */ #include <glibmm/object.h> +#include <glibmm/priorities.h> #include <giomm/asyncresult.h> #include <giomm/cancellable.h> diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg index ac12d922..91696a83 100644 --- a/gio/src/iostream.ccg +++ b/gio/src/iostream.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/asyncresult.h> #include "slot_async.h" diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg index 34b024b2..2ff4d601 100644 --- a/gio/src/loadableicon.ccg +++ b/gio/src/loadableicon.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/private/icon_p.h> #include "slot_async.h" diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg index 31778693..6d1ac668 100644 --- a/gio/src/mount.ccg +++ b/gio/src/mount.ccg @@ -17,6 +17,8 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/error.h> +#include <glibmm/exceptionhandler.h> #include <giomm/drive.h> #include <giomm/volume.h> #include <gio/gio.h> diff --git a/gio/src/mountoperation.ccg b/gio/src/mountoperation.ccg index 70b732c6..4aa77615 100644 --- a/gio/src/mountoperation.ccg +++ b/gio/src/mountoperation.ccg @@ -18,3 +18,4 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg index 03350dc0..63dfc5a3 100644 --- a/gio/src/mountoperation.hg +++ b/gio/src/mountoperation.hg @@ -18,6 +18,7 @@ */ #include <glibmm/object.h> +#include <glibmm/arrayhandle.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) diff --git a/gio/src/networkaddress.ccg b/gio/src/networkaddress.ccg index b5405191..182b5075 100644 --- a/gio/src/networkaddress.ccg +++ b/gio/src/networkaddress.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/asyncresult.h> #include "slot_async.h" diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg index ae517467..cec6b7ed 100644 --- a/gio/src/proxyresolver.ccg +++ b/gio/src/proxyresolver.ccg @@ -21,6 +21,7 @@ #include <utility> #include <glibmm/error.h> #include <glibmm/exceptionhandler.h> +#include <glibmm/vectorutils.h> #include "slot_async.h" namespace Gio diff --git a/gio/src/resolver.ccg b/gio/src/resolver.ccg index fb63c06f..25b7c352 100644 --- a/gio/src/resolver.ccg +++ b/gio/src/resolver.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include "slot_async.h" namespace Gio diff --git a/gio/src/seekable.hg b/gio/src/seekable.hg index 869f7373..43277c49 100644 --- a/gio/src/seekable.hg +++ b/gio/src/seekable.hg @@ -19,6 +19,7 @@ #include <giomm/cancellable.h> #include <glibmm/interface.h> +#include <glibmm/iochannel.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/interface_p.h) diff --git a/gio/src/settings.ccg b/gio/src/settings.ccg index a37df2c9..a32ad948 100644 --- a/gio/src/settings.ccg +++ b/gio/src/settings.ccg @@ -16,6 +16,8 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> +#include <glibmm/vectorutils.h> namespace Gio { diff --git a/gio/src/settings.hg b/gio/src/settings.hg index 14528736..daf6af77 100644 --- a/gio/src/settings.hg +++ b/gio/src/settings.hg @@ -15,6 +15,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/arrayhandle.h> #include <glibmm/object.h> #include <glibmm/variant.h> diff --git a/gio/src/simpleaction.ccg b/gio/src/simpleaction.ccg index eaf0b625..f1623f61 100644 --- a/gio/src/simpleaction.ccg +++ b/gio/src/simpleaction.ccg @@ -16,6 +16,8 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> +#include <glibmm/variant.h> namespace Gio { diff --git a/gio/src/socket.ccg b/gio/src/socket.ccg index 2d1cb3df..6b2efcdd 100644 --- a/gio/src/socket.ccg +++ b/gio/src/socket.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/asyncresult.h> #include "slot_async.h" diff --git a/gio/src/socket.hg b/gio/src/socket.hg index 78db2101..4d13cd6b 100644 --- a/gio/src/socket.hg +++ b/gio/src/socket.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/iochannel.h> #include <glibmm/object.h> #include <giomm/initable.h> #include <giomm/credentials.h> diff --git a/gio/src/socketaddress.ccg b/gio/src/socketaddress.ccg index 251999be..eb8adb63 100644 --- a/gio/src/socketaddress.ccg +++ b/gio/src/socketaddress.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/asyncresult.h> #include "slot_async.h" diff --git a/gio/src/socketaddressenumerator.ccg b/gio/src/socketaddressenumerator.ccg index 3c6d8591..301c3fd7 100644 --- a/gio/src/socketaddressenumerator.ccg +++ b/gio/src/socketaddressenumerator.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/error.h> #include <giomm/socketaddress.h> #include "slot_async.h" diff --git a/gio/src/socketcontrolmessage.ccg b/gio/src/socketcontrolmessage.ccg index 555a34bc..e7119a37 100644 --- a/gio/src/socketcontrolmessage.ccg +++ b/gio/src/socketcontrolmessage.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/socketservice.ccg b/gio/src/socketservice.ccg index 6e077695..58f32513 100644 --- a/gio/src/socketservice.ccg +++ b/gio/src/socketservice.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/srvtarget.ccg b/gio/src/srvtarget.ccg index c146baae..10c0e4ed 100644 --- a/gio/src/srvtarget.ccg +++ b/gio/src/srvtarget.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/utility.h> namespace Gio { diff --git a/gio/src/threadedsocketservice.ccg b/gio/src/threadedsocketservice.ccg index 6e077695..58f32513 100644 --- a/gio/src/threadedsocketservice.ccg +++ b/gio/src/threadedsocketservice.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/gio/src/unixfdlist.ccg b/gio/src/unixfdlist.ccg index 26cfe997..4fbed4dd 100644 --- a/gio/src/unixfdlist.ccg +++ b/gio/src/unixfdlist.ccg @@ -18,6 +18,7 @@ */ #include <gio/gunixfdlist.h> +#include <glibmm/error.h> namespace Gio { diff --git a/gio/src/unixfdlist.hg b/gio/src/unixfdlist.hg index ae215f4b..4ff3ec4d 100644 --- a/gio/src/unixfdlist.hg +++ b/gio/src/unixfdlist.hg @@ -18,6 +18,7 @@ */ #include <glibmm/object.h> +#include <glibmm/arrayhandle.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) diff --git a/gio/src/unixfdmessage.ccg b/gio/src/unixfdmessage.ccg index 6ac74d65..ec38df44 100644 --- a/gio/src/unixfdmessage.ccg +++ b/gio/src/unixfdmessage.ccg @@ -18,6 +18,7 @@ */ #include <gio/gunixfdmessage.h> +#include <glibmm/error.h> #include <giomm/unixfdlist.h> namespace Gio diff --git a/gio/src/unixfdmessage.hg b/gio/src/unixfdmessage.hg index b07a31bb..05a1e103 100644 --- a/gio/src/unixfdmessage.hg +++ b/gio/src/unixfdmessage.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <glibmm/arrayhandle.h> #include <giomm/socketcontrolmessage.h> _DEFS(giomm,gio) diff --git a/gio/src/volumemonitor.ccg b/gio/src/volumemonitor.ccg index f87a48e3..ef4ee3f5 100644 --- a/gio/src/volumemonitor.ccg +++ b/gio/src/volumemonitor.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> +#include <glibmm/exceptionhandler.h> namespace Gio { diff --git a/tools/m4/base.m4 b/tools/m4/base.m4 index a81e107e..228bbf58 100644 --- a/tools/m4/base.m4 +++ b/tools/m4/base.m4 @@ -281,7 +281,8 @@ _IMPORT(SECTION_HEADER_FIRST) _DEPRECATE_IFDEF_CLASS_START m4_ifelse(__MODULE__,glibmm,,`dnl else -#include <glibmm.h> +#include <glibmm/ustring.h> +#include <sigc++/sigc++.h> ')dnl _IMPORT(SECTION_HEADER1) _IMPORT(SECTION_HEADER2) |