summaryrefslogtreecommitdiff
path: root/gio/src/dbusconnection.ccg
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2015-11-20 10:10:22 +0100
committerMurray Cumming <murrayc@murrayc.com>2015-11-20 10:18:15 +0100
commit18db5d7fff3b21a754dd053c0af658bdff90241e (patch)
tree3b40c00418e127be04d95804cbf734f1bf705f4e /gio/src/dbusconnection.ccg
parentb879555ffb731ba1fa9aabfd1520dd8ca88cd3c9 (diff)
downloadglibmm-18db5d7fff3b21a754dd053c0af658bdff90241e.tar.gz
Gio::DBus: Use nullptr instead of 0.
Diffstat (limited to 'gio/src/dbusconnection.ccg')
-rw-r--r--gio/src/dbusconnection.ccg86
1 files changed, 43 insertions, 43 deletions
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 465d1262..9397525d 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -71,7 +71,7 @@ static GDBusMessage* DBusConnection_Message_Filter_giomm_callback(
auto result = (*the_slot)(
Glib::wrap(connection, true), Glib::wrap(message, true),
static_cast<bool>(incoming));
- return (result) ? result->gobj_copy() : 0;
+ return (result) ? result->gobj_copy() : nullptr;
}
catch(...)
{
@@ -104,7 +104,7 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -118,9 +118,9 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init_async(slot, cancellable);
}
@@ -132,7 +132,7 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -145,9 +145,9 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init_async(slot);
}
@@ -158,7 +158,7 @@ Connection::Connection(const std::string& address,
const Glib::RefPtr<Cancellable>& cancellable,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -170,9 +170,9 @@ Connection::Connection(const std::string& address,
const Glib::RefPtr<Cancellable>& cancellable,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init_async(slot, cancellable);
}
@@ -182,7 +182,7 @@ Connection::Connection(const std::string& address,
const SlotAsyncReady& slot,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -193,9 +193,9 @@ Connection::Connection(const std::string& address,
const SlotAsyncReady& slot,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init_async(slot);
}
@@ -207,7 +207,7 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -220,9 +220,9 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init(cancellable);
}
@@ -233,7 +233,7 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -245,9 +245,9 @@ Connection::Connection(const Glib::RefPtr<IOStream>& stream,
ConnectionFlags flags)
:
_CONSTRUCT("stream", Glib::unwrap(stream),
- "guid", (guid.empty() ? 0 : guid.c_str()),
+ "guid", (guid.empty() ? nullptr : guid.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init();
}
@@ -257,7 +257,7 @@ Connection::Connection(const std::string& address,
const Glib::RefPtr<Cancellable>& cancellable,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -268,9 +268,9 @@ Connection::Connection(const std::string& address,
const Glib::RefPtr<Cancellable>& cancellable,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init(cancellable);
}
@@ -279,7 +279,7 @@ Connection::Connection(const std::string& address,
const Glib::RefPtr<AuthObserver>& observer,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
"authentication-observer", Glib::unwrap(observer))
{
@@ -289,9 +289,9 @@ Connection::Connection(const std::string& address,
Connection::Connection(const std::string& address,
ConnectionFlags flags)
:
- _CONSTRUCT("address", (address.empty() ? 0 : address.c_str()),
+ _CONSTRUCT("address", (address.empty() ? nullptr : address.c_str()),
"flags", static_cast<GDBusConnectionFlags>(flags),
- "authentication-observer", static_cast<GDBusAuthObserver*>(0))
+ "authentication-observer", static_cast<GDBusAuthObserver*>(nullptr))
{
init();
}
@@ -488,13 +488,13 @@ void Connection::get(BusType bus_type, const SlotAsyncReady& slot)
{
auto slot_copy = new SlotAsyncReady(slot);
- g_bus_get(static_cast<GBusType>(bus_type), 0, &SignalProxy_async_callback,
+ g_bus_get(static_cast<GBusType>(bus_type), nullptr, &SignalProxy_async_callback,
slot_copy);
}
void Connection::close()
{
- g_dbus_connection_close(gobj(), 0, 0, 0);
+ g_dbus_connection_close(gobj(), nullptr, nullptr, nullptr);
}
void Connection::close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
@@ -512,14 +512,14 @@ void Connection::close(const SlotAsyncReady& slot)
auto slot_copy = new SlotAsyncReady(slot);
g_dbus_connection_close(gobj(),
- 0,
+ nullptr,
&SignalProxy_async_callback,
slot_copy);
}
void Connection::flush()
{
- g_dbus_connection_flush(gobj(), 0, 0, 0);
+ g_dbus_connection_flush(gobj(), nullptr, nullptr, nullptr);
}
void Connection::flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
@@ -537,7 +537,7 @@ void Connection::flush(const SlotAsyncReady& slot)
auto slot_copy = new SlotAsyncReady(slot);
g_dbus_connection_flush(gobj(),
- 0,
+ nullptr,
&SignalProxy_async_callback,
slot_copy);
}
@@ -548,7 +548,7 @@ bool Connection::send_message(const Glib::RefPtr<Message>& message,
GError* gerror = nullptr;
const bool result = g_dbus_connection_send_message(gobj(),
- Glib::unwrap(message), static_cast<GDBusSendMessageFlags>(flags), 0,
+ Glib::unwrap(message), static_cast<GDBusSendMessageFlags>(flags), nullptr,
&gerror);
if(gerror)
@@ -576,7 +576,7 @@ void Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, i
g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message),
static_cast<GDBusSendMessageFlags>(message->get_flags()),
timeout_msec, &out_serial,
- 0, &SignalProxy_async_callback,
+ nullptr, &SignalProxy_async_callback,
slot_copy);
message->set_serial(out_serial);
}
@@ -612,7 +612,7 @@ Glib::RefPtr<Message> Connection::send_message_with_reply_sync(
g_dbus_connection_send_message_with_reply_sync(gobj(),
Glib::unwrap(message),
static_cast<GDBusSendMessageFlags>(message->get_flags()), timeout_msec,
- &out_serial, 0, &gerror);
+ &out_serial, nullptr, &gerror);
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -664,7 +664,7 @@ void Connection::call(
g_dbus_connection_call(gobj(), bus_name.c_str(), object_path.c_str(),
interface_name.c_str(), method_name.c_str(),
const_cast<GVariant*>(parameters.gobj()), reply_type.gobj(),
- static_cast<GDBusCallFlags>(flags), timeout_msec, 0,
+ static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr,
&SignalProxy_async_callback, slot_copy);
}
@@ -711,7 +711,7 @@ Glib::VariantContainerBase Connection::call_sync(
g_dbus_connection_call_sync(gobj(), bus_name.c_str(), object_path.c_str(),
interface_name.c_str(), method_name.c_str(),
const_cast<GVariant*>(parameters.gobj()), reply_type.gobj(),
- static_cast<GDBusCallFlags>(flags), timeout_msec, 0, &gerror);
+ static_cast<GDBusCallFlags>(flags), timeout_msec, nullptr, &gerror);
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -768,7 +768,7 @@ void Connection::call(
object_path.c_str(), interface_name.c_str(), method_name.c_str(),
const_cast<GVariant*>(parameters.gobj()), reply_type.gobj(),
static_cast<GDBusCallFlags>(flags), timeout_msec, Glib::unwrap(fd_list),
- 0, &SignalProxy_async_callback, slot_copy);
+ nullptr, &SignalProxy_async_callback, slot_copy);
}
#endif // G_OS_UNIX
@@ -786,10 +786,10 @@ void Connection::emit_signal(
// the bus name can be nullptr in the C API meaning that the signal should be
// emitted to all the listeners.
g_dbus_connection_emit_signal(gobj(),
- (destination_bus_name.empty() ? 0 : destination_bus_name.c_str()),
- (object_path.empty()? 0 : object_path.c_str()),
- (interface_name.empty() ? 0 : interface_name.c_str()),
- (signal_name.empty() ? 0 : signal_name.c_str()),
+ (destination_bus_name.empty() ? nullptr : destination_bus_name.c_str()),
+ (object_path.empty()? nullptr : object_path.c_str()),
+ (interface_name.empty() ? nullptr : interface_name.c_str()),
+ (signal_name.empty() ? nullptr : signal_name.c_str()),
const_cast<GVariant*>(parameters.gobj()), &gerror);
if(gerror)
@@ -835,7 +835,7 @@ guint Connection::register_object(const Glib::ustring& object_path,
const guint result = g_dbus_connection_register_object(gobj(),
object_path.c_str(), Glib::unwrap(interface_info),
- vtable.gobj(), const_cast<InterfaceVTable*>(&vtable), 0, &gerror);
+ vtable.gobj(), const_cast<InterfaceVTable*>(&vtable), nullptr, &gerror);
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -850,7 +850,7 @@ guint Connection::register_object(const Glib::ustring& object_path,
const guint result = g_dbus_connection_register_object(gobj(),
object_path.c_str(), Glib::unwrap(interface_info),
- 0, 0, 0, &gerror);
+ nullptr, nullptr, nullptr, &gerror);
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -866,7 +866,7 @@ guint Connection::register_subtree(const Glib::ustring& object_path,
const guint result = g_dbus_connection_register_subtree(gobj(),
object_path.c_str(),
vtable.gobj(), static_cast<GDBusSubtreeFlags>(flags),
- const_cast<SubtreeVTable*>(&vtable), 0, &gerror);
+ const_cast<SubtreeVTable*>(&vtable), nullptr, &gerror);
if(gerror)
::Glib::Error::throw_exception(gerror);