diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-01-07 12:10:57 -0500 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-01-07 12:10:57 -0500 |
| commit | 02cb6c80ee5e53f6f8dca175ef5c5c31b88b1e50 (patch) | |
| tree | 34355058740f4271b28e044e7e2c8fa425318ba4 /gio/src/dbusconnection.ccg | |
| parent | ca169fa4f005e054a28567ecb6fb699fbae449ad (diff) | |
| download | glibmm-02cb6c80ee5e53f6f8dca175ef5c5c31b88b1e50.tar.gz | |
DBusConnection: Use gobj() instead of reinterpret_cast<> for *VTable.
* gio/src/dbusconnection.ccg: Use the gobj() of the
DBusInterfaceVTable instead of casting it to a GDBusInterfaceVTable in
the callbacks and in the register_object() method.
Diffstat (limited to 'gio/src/dbusconnection.ccg')
| -rw-r--r-- | gio/src/dbusconnection.ccg | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg index ac6bbc69..20933dc4 100644 --- a/gio/src/dbusconnection.ccg +++ b/gio/src/dbusconnection.ccg @@ -249,8 +249,7 @@ static const GDBusInterfaceVTable* DBusSubtreeVTable_Dispatch_giomm_callback( *out_user_data = const_cast<Gio::DBusInterfaceVTable*>(vtable); - return reinterpret_cast<GDBusInterfaceVTable*>( - const_cast<Gio::DBusInterfaceVTable*>(vtable)); + return vtable->gobj(); } catch(...) { @@ -980,8 +979,7 @@ guint DBusConnection::register_object(const Glib::ustring& object_path, const guint result = g_dbus_connection_register_object(gobj(), object_path.c_str(), Glib::unwrap(interface_info), - reinterpret_cast<GDBusInterfaceVTable*>(const_cast<DBusInterfaceVTable*>(vtable)), - const_cast<DBusInterfaceVTable*>(vtable), 0, &gerror); + vtable->gobj(), const_cast<DBusInterfaceVTable*>(vtable), 0, &gerror); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -996,8 +994,7 @@ guint DBusConnection::register_subtree(const Glib::ustring& object_path, const guint result = g_dbus_connection_register_subtree(gobj(), object_path.c_str(), - reinterpret_cast<GDBusSubtreeVTable*>(const_cast<DBusSubtreeVTable*>(vtable)), - static_cast<GDBusSubtreeFlags>(flags), + vtable->gobj(), static_cast<GDBusSubtreeFlags>(flags), const_cast<DBusSubtreeVTable*>(vtable), 0, &gerror); if(gerror) |