From 5747f3139219abd6c8670953620cee1f5584caba Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 29 Jul 2020 16:30:13 +0200
Subject: Another round of 0->nullptr cleanup

Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/dbus/qdbus_symbols.cpp   | 4 ++--
 src/dbus/qdbusconnection.cpp | 2 +-
 src/dbus/qdbusintegrator.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/dbus')

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;
-- 
cgit v1.2.3