Replace Q_NULLPTR with nullptr where possible

Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
  (definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 75c1e92f96..c95f195aca 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -147,7 +147,7 @@ QDBusConnectionManager::QDBusConnectionManager()
     // prevent the library from being unloaded on Windows. See comments in the function.
     preventDllUnload();
 #endif
-    defaultBuses[0] = defaultBuses[1] = Q_NULLPTR;
+    defaultBuses[0] = defaultBuses[1] = nullptr;
     start();
 }
 
@@ -186,13 +186,13 @@ void QDBusConnectionManager::run()
             delete d;
         } else {
             d->closeConnection();
-            d->moveToThread(Q_NULLPTR);     // allow it to be deleted in another thread
+            d->moveToThread(nullptr);     // allow it to be deleted in another thread
         }
     }
     connectionHash.clear();
 
     // allow deletion from any thread without warning
-    moveToThread(Q_NULLPTR);
+    moveToThread(nullptr);
 }
 
 QDBusConnectionPrivate *QDBusConnectionManager::connectToBus(QDBusConnection::BusType type, const QString &name,
@@ -1175,7 +1175,7 @@ bool QDBusConnection::unregisterService(const QString &serviceName)
 QDBusConnection QDBusConnection::sessionBus()
 {
     if (_q_manager.isDestroyed())
-        return QDBusConnection(Q_NULLPTR);
+        return QDBusConnection(nullptr);
     return QDBusConnection(_q_manager()->busConnection(SessionBus));
 }
 
@@ -1189,7 +1189,7 @@ QDBusConnection QDBusConnection::sessionBus()
 QDBusConnection QDBusConnection::systemBus()
 {
     if (_q_manager.isDestroyed())
-        return QDBusConnection(Q_NULLPTR);
+        return QDBusConnection(nullptr);
     return QDBusConnection(_q_manager()->busConnection(SystemBus));
 }