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/dbusownname.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/dbusownname.hg')
-rw-r--r-- | gio/src/dbusownname.hg | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg index e6db230c..39132b76 100644 --- a/gio/src/dbusownname.hg +++ b/gio/src/dbusownname.hg @@ -27,29 +27,29 @@ namespace Gio namespace DBus { -_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags) +_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags, s#^DBUS_##) /** For example, - * void on_bus_acquired(const Glib::RefPtr<Gio::DBusConnection>& connection, + * void on_bus_acquired(const Glib::RefPtr<Gio::DBus::Connection>& connection, * const Glib::ustring& name); * @newin{2,28} * @ingroup DBus */ -typedef sigc::slot<void, const Glib::RefPtr<Gio::DBusConnection>&, Glib::ustring> SlotBusAcquired; +typedef sigc::slot<void, const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring> SlotBusAcquired; /** For example, - * void on_name_acquired(const Glib::RefPtr<Gio::DBusConnection>& connection, + * void on_name_acquired(const Glib::RefPtr<Gio::DBus::Connection>& connection, * const Glib::ustring& name); * @ingroup DBus */ -typedef sigc::slot<void, const Glib::RefPtr<Gio::DBusConnection>&, Glib::ustring> SlotNameAcquired; +typedef sigc::slot<void, const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring> SlotNameAcquired; /** For example, - * void on_name_lost(const Glib::RefPtr<Gio::DBusConnection>& connection, + * void on_name_lost(const Glib::RefPtr<Gio::DBus::Connection>& connection, * const Glib::ustring& name); * @ingroup DBus */ -typedef sigc::slot<void, const Glib::RefPtr<Gio::DBusConnection>&, Glib::ustring> SlotNameLost; +typedef sigc::slot<void, const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring> SlotNameLost; //TODO: Add example from C API in class docs. /** Starts acquiring @a name on the bus specified by @a bus_type and calls @a @@ -74,7 +74,7 @@ typedef sigc::slot<void, const Glib::RefPtr<Gio::DBusConnection>&, Glib::ustring * If the name is acquired or lost (for example another application could * acquire the name if you allow replacement or the application currently * owning the name exits), the slots are also invoked. If the - * DBusConnection that is used for attempting to own the name closes, then + * Connection that is used for attempting to own the name closes, then * @a name_lost_slot is invoked since it is no longer possible for other * processes to access the process. * |