summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbus_symbols.cpp4
-rw-r--r--src/dbus/qdbusconnection.cpp2
-rw-r--r--src/dbus/qdbusintegrator.cpp8
3 files changed, 7 insertions, 7 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 1e2cbf6da6..dd74307fda 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -133,7 +133,7 @@ void (*qdbus_resolve_conditionally(const char *name))()
#else
Q_UNUSED(name);
#endif
- return 0;
+ return nullptr;
}
void (*qdbus_resolve_me(const char *name))()
@@ -149,7 +149,7 @@ void (*qdbus_resolve_me(const char *name))()
return ptr;
#else
Q_UNUSED(name);
- return 0;
+ return nullptr;
#endif
}
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 329a539e23..78c596bea6 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -99,7 +99,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::busConnection(QDBusConnection::B
QDBusConnectionPrivate *QDBusConnectionManager::connection(const QString &name) const
{
- return connectionHash.value(name, 0);
+ return connectionHash.value(name, nullptr);
}
void QDBusConnectionManager::removeConnection(const QString &name)
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 07816568e5..ac55b7cb76 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -930,7 +930,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q
// let's create the parameter list
// first one is the return type -- add it below
- params.append(0);
+ params.append(nullptr);
// add the input parameters
int i;
@@ -1186,7 +1186,7 @@ bool QDBusConnectionPrivate::handleError(const QDBusErrorInternal &error)
void QDBusConnectionPrivate::timerEvent(QTimerEvent *e)
{
{
- DBusTimeout *timeout = timeouts.value(e->timerId(), 0);
+ DBusTimeout *timeout = timeouts.value(e->timerId(), nullptr);
if (timeout)
q_dbus_timeout_handle(timeout);
}
@@ -2582,7 +2582,7 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa
// service must be a unique connection name
if (!interface.isEmpty()) {
QDBusReadLocker locker(FindMetaObject1Action, this);
- QDBusMetaObject *mo = cachedMetaObjects.value(interface, 0);
+ QDBusMetaObject *mo = cachedMetaObjects.value(interface, nullptr);
if (mo)
return mo;
}
@@ -2599,7 +2599,7 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa
QDBusWriteLocker locker(FindMetaObject2Action, this);
QDBusMetaObject *mo = nullptr;
if (!interface.isEmpty())
- mo = cachedMetaObjects.value(interface, 0);
+ mo = cachedMetaObjects.value(interface, nullptr);
if (mo)
// maybe it got created when we switched from read to write lock
return mo;