From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: 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 Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/dbus/qdbusconnection.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/dbus/qdbusconnection.cpp') 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)); } -- cgit v1.2.3