diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-02-16 11:29:19 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-02-16 11:29:19 +0100 |
| commit | 4e118b927f83290bae27bcae707be8e1c83f47d5 (patch) | |
| tree | ec7ec4fa6c8424e19a97dc935d6f4e61ece8d882 /gio/src/error.hg | |
| parent | ce84ddbd917364c61d50c3921c1f32fdde9f6698 (diff) | |
| download | glibmm-4e118b927f83290bae27bcae707be8e1c83f47d5.tar.gz | |
Move the DBus classes into a Gio::DBus namespace.
* gio/giomm.h:
* gio/src/dbus*.[hg|ccg]
* gio/src/error.hg: Rename all DBus* classes to remove the prefix, putting
them in a Gio::DBus namespace.
This required the use of the new _GMMPROC_EXTRA_NAMESPACE macro, to avoid
generating a confused wrap_init.cc.
Along the way, I removed unnecessary class predeclarations, instead including
the relevant header, because that is more convenient for users of the API.
* gio/src/dbuserror.[hg|ccg]: Renamed to dbuserrorutils.[hg|ccg] and
renamed the Error namespace to ErrorUtils, to avoid a clash with the
Gio::DBus::Error exception.
* gio/src/filelist.am:
* tools/m4/convert_gio.m4: Changed some conversions.
* examples/dbus/busserver.cc:
* examples/dbus/peer.cc:
* examples/dbus/userbus.cc: Adapted.
This is generally more organized. A prefix, instead of a namespace, looked
generally wrong to C++ coders.
Diffstat (limited to 'gio/src/error.hg')
| -rw-r--r-- | gio/src/error.hg | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gio/src/error.hg b/gio/src/error.hg index 8bc9b1b9..f22b153e 100644 --- a/gio/src/error.hg +++ b/gio/src/error.hg @@ -40,10 +40,13 @@ namespace Gio /** Exception class for giomm errors. */ -_WRAP_GERROR(DBusError, GDBusError, G_DBUS_ERROR, NO_GTYPE) _WRAP_GERROR(Error, GIOErrorEnum, G_IO_ERROR, NO_GTYPE) _WRAP_GERROR(ResolverError, GResolverError, G_RESOLVER_ERROR, NO_GTYPE) +namespace DBus +{ +_WRAP_GERROR(Error, GDBusError, G_DBUS_ERROR, NO_GTYPE) +} //namespace DBus } // namespace Gio |