diff options
author | Murray Cumming <murrayc@murrayc.com> | 2015-07-15 12:45:22 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2015-07-15 12:45:22 +0200 |
commit | 40f91e93e079a59d6e39bf0f7f2012357d3ee763 (patch) | |
tree | 8fcaf53512a26f6440362b87d3139d634eb76dd6 /gio/src/dbusconnection.ccg | |
parent | 254f5b93e08e45cd32ccdbb0f4a31c433ece9d08 (diff) | |
download | glibmm-40f91e93e079a59d6e39bf0f7f2012357d3ee763.tar.gz |
C++11: Some use of the auto keyword.
Diffstat (limited to 'gio/src/dbusconnection.ccg')
-rw-r--r-- | gio/src/dbusconnection.ccg | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg index f2f60355..31020505 100644 --- a/gio/src/dbusconnection.ccg +++ b/gio/src/dbusconnection.ccg @@ -68,7 +68,7 @@ static GDBusMessage* DBusConnection_Message_Filter_giomm_callback( try { - Glib::RefPtr<Gio::DBus::Message> result = (*the_slot)( + auto result = (*the_slot)( Glib::wrap(connection, true), Glib::wrap(message, true), static_cast<bool>(incoming)); return (result) ? result->gobj_copy() : 0; @@ -477,7 +477,7 @@ Glib::RefPtr<Connection> Connection::create_for_address_sync( void Connection::get(BusType bus_type, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_bus_get(static_cast<GBusType>(bus_type), Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy); @@ -486,7 +486,7 @@ void Connection::get(BusType bus_type, const SlotAsyncReady& slot, //static void Connection::get(BusType bus_type, const SlotAsyncReady& slot) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_bus_get(static_cast<GBusType>(bus_type), 0, &SignalProxy_async_callback, slot_copy); @@ -499,7 +499,7 @@ void Connection::close() void Connection::close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_close(gobj(), Glib::unwrap(cancellable), @@ -509,7 +509,7 @@ void Connection::close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellabl void Connection::close(const SlotAsyncReady& slot) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_close(gobj(), 0, @@ -524,7 +524,7 @@ void Connection::flush() void Connection::flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_flush(gobj(), Glib::unwrap(cancellable), @@ -534,7 +534,7 @@ void Connection::flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellabl void Connection::flush(const SlotAsyncReady& slot) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_flush(gobj(), 0, @@ -559,7 +559,7 @@ bool Connection::send_message(const Glib::RefPtr<Message>& message, void Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, int timeout_msec,const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); volatile guint32 out_serial = 0; g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), static_cast<GDBusSendMessageFlags>(message->get_flags()), @@ -571,7 +571,7 @@ void Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, i void Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, int timeout_msec,const SlotAsyncReady& slot) { - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); volatile guint32 out_serial = 0; g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), static_cast<GDBusSendMessageFlags>(message->get_flags()), @@ -635,7 +635,7 @@ void Connection::call( // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_call(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), @@ -659,7 +659,7 @@ void Connection::call( // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_call(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), @@ -737,7 +737,7 @@ void Connection::call( // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_call_with_unix_fd_list(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), @@ -762,7 +762,7 @@ void Connection::call( // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_dbus_connection_call_with_unix_fd_list(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), @@ -805,7 +805,7 @@ guint Connection::signal_subscribe( const Glib::ustring& arg0, SignalFlags flags) { - SlotSignal* slot_copy = new SlotSignal(slot); + auto slot_copy = new SlotSignal(slot); return g_dbus_connection_signal_subscribe(gobj(), sender.c_str(), interface_name.c_str(), member.c_str(), object_path.c_str(), arg0.c_str(), @@ -816,7 +816,7 @@ guint Connection::signal_subscribe( guint Connection::add_filter(const SlotMessageFilter& slot) { - SlotMessageFilter* slot_copy = new SlotMessageFilter(slot); + auto slot_copy = new SlotMessageFilter(slot); return g_dbus_connection_add_filter(gobj(), &DBusConnection_Message_Filter_giomm_callback, slot_copy, |