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/qdbusabstractinterface.cpp | 2 +- src/dbus/qdbusargument.h | 6 +++--- src/dbus/qdbusconnection.cpp | 10 +++++----- src/dbus/qdbusconnection.h | 2 +- src/dbus/qdbusintegrator.cpp | 8 ++++---- src/dbus/qdbusintegrator_p.h | 2 +- src/dbus/qdbusinterface.h | 2 +- src/dbus/qdbuspendingcall.h | 4 ++-- src/dbus/qdbusreply.h | 2 +- src/dbus/qdbusserver.cpp | 2 +- src/dbus/qdbusserver.h | 4 ++-- src/dbus/qdbusservicewatcher.h | 4 ++-- src/dbus/qdbusvirtualobject.h | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 2239f48a7d..50a0483231 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -70,7 +70,7 @@ class DisconnectRelayEvent : public QMetaCallEvent { public: DisconnectRelayEvent(QObject *sender, const QMetaMethod &m) - : QMetaCallEvent(0, 0, Q_NULLPTR, sender, m.methodIndex()) + : QMetaCallEvent(0, 0, nullptr, sender, m.methodIndex()) {} void placeMetaCall(QObject *object) override diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 5342a79227..a6d4e9cd25 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -77,7 +77,7 @@ public: QDBusArgument(); QDBusArgument(const QDBusArgument &other); #ifdef Q_COMPILER_RVALUE_REFS - QDBusArgument(QDBusArgument &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; } + QDBusArgument(QDBusArgument &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; } QDBusArgument &operator=(QDBusArgument &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif QDBusArgument &operator=(const QDBusArgument &other); @@ -160,7 +160,7 @@ QT_BEGIN_NAMESPACE template inline T qdbus_cast(const QDBusArgument &arg #ifndef Q_QDOC -, T * = Q_NULLPTR +, T * = nullptr #endif ) { @@ -171,7 +171,7 @@ template inline T qdbus_cast(const QDBusArgument &arg template inline T qdbus_cast(const QVariant &v #ifndef Q_QDOC -, T * = Q_NULLPTR +, T * = nullptr #endif ) { 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)); } diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index ba28938b60..0352978989 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -130,7 +130,7 @@ public: explicit QDBusConnection(const QString &name); QDBusConnection(const QDBusConnection &other); #ifdef Q_COMPILER_RVALUE_REFS - QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; } + QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; } QDBusConnection &operator=(QDBusConnection &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif QDBusConnection &operator=(const QDBusConnection &other); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 16cd021d0d..c74c63fdc6 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1078,7 +1078,7 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate() Q_ASSERT(ref.load() == 0); QObject *obj = (QObject *)busService; if (obj) { - disconnect(obj, Q_NULLPTR, this, Q_NULLPTR); + disconnect(obj, nullptr, this, nullptr); delete obj; } if (connection) @@ -1950,7 +1950,7 @@ bool QDBusConnectionPrivate::send(const QDBusMessage& message) q_dbus_message_set_no_reply(msg, true); // the reply would not be delivered to anything qDBusDebug() << this << "sending message (no reply):" << message; - emit messageNeedsSending(Q_NULLPTR, msg); + emit messageNeedsSending(nullptr, msg); return true; } @@ -2166,7 +2166,7 @@ void QDBusConnectionPrivate::sendInternal(QDBusPendingCallPrivate *pcall, void * checkThread(); QDBusDispatchLocker locker(SendMessageAction, this); - if (isNoReply && q_dbus_connection_send(connection, msg, Q_NULLPTR)) { + if (isNoReply && q_dbus_connection_send(connection, msg, nullptr)) { // success } else if (!isNoReply && q_dbus_connection_send_with_reply(connection, msg, &pending, timeout)) { if (pending) { @@ -2509,7 +2509,7 @@ QString QDBusConnectionPrivate::getNameOwnerNoCache(const QString &serviceName) QDBusMessagePrivate::setParametersValidated(msg, true); msg << serviceName; - QDBusPendingCallPrivate *pcall = sendWithReplyAsync(msg, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR); + QDBusPendingCallPrivate *pcall = sendWithReplyAsync(msg, nullptr, nullptr, nullptr); if (thread() == QThread::currentThread()) { // this function may be called in our own thread and // QDBusPendingCallPrivate::waitForFinished() would deadlock there diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 6026508a5c..3cd029a933 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -148,7 +148,7 @@ public: typedef void (*Hook)(const QDBusMessage&); QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg, const Hook *hooks, int count) - : QMetaCallEvent(0, 0, Q_NULLPTR, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) + : QMetaCallEvent(0, 0, nullptr, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) {} ~QDBusSpyCallEvent(); void placeMetaCall(QObject *) override; diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 5d73cf8bc3..c147d07d50 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -59,7 +59,7 @@ private: public: QDBusInterface(const QString &service, const QString &path, const QString &interface = QString(), const QDBusConnection &connection = QDBusConnection::sessionBus(), - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); ~QDBusInterface(); virtual const QMetaObject *metaObject() const override; diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 1e4c6ebfd2..ec8ba6c541 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -100,7 +100,7 @@ class Q_DBUS_EXPORT QDBusPendingCallWatcher: public QObject, public QDBusPending { Q_OBJECT public: - explicit QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = Q_NULLPTR); + explicit QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = nullptr); ~QDBusPendingCallWatcher(); #ifdef Q_QDOC @@ -110,7 +110,7 @@ public: void waitForFinished(); // non-virtual override Q_SIGNALS: - void finished(QDBusPendingCallWatcher *self = Q_NULLPTR); + void finished(QDBusPendingCallWatcher *self = nullptr); private: Q_DECLARE_PRIVATE(QDBusPendingCallWatcher) diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 227615024a..869687ac85 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -130,7 +130,7 @@ private: template<> inline QDBusReply& QDBusReply::operator=(const QDBusMessage &reply) { - void *null = Q_NULLPTR; + void *null = nullptr; QVariant data(qMetaTypeId(), null); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast(data).variant(); diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index ce55297abb..a2dfb86164 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -116,7 +116,7 @@ QDBusServer::~QDBusServer() QDBusConnectionManager::instance()->removeConnection(name); d->serverConnectionNames.clear(); } - d->serverObject = Q_NULLPTR; + d->serverObject = nullptr; d->ref.store(0); d->deleteLater(); } diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index ac4dfcb67f..668b8705b1 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -57,8 +57,8 @@ class Q_DBUS_EXPORT QDBusServer: public QObject { Q_OBJECT public: - explicit QDBusServer(const QString &address, QObject *parent = Q_NULLPTR); - explicit QDBusServer(QObject *parent = Q_NULLPTR); + explicit QDBusServer(const QString &address, QObject *parent = nullptr); + explicit QDBusServer(QObject *parent = nullptr); virtual ~QDBusServer(); bool isConnected() const; diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 77573beb5d..2c45c85cb9 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -64,9 +64,9 @@ public: Q_DECLARE_FLAGS(WatchMode, WatchModeFlag) Q_FLAG(WatchMode) - explicit QDBusServiceWatcher(QObject *parent = Q_NULLPTR); + explicit QDBusServiceWatcher(QObject *parent = nullptr); QDBusServiceWatcher(const QString &service, const QDBusConnection &connection, - WatchMode watchMode = WatchForOwnerChange, QObject *parent = Q_NULLPTR); + WatchMode watchMode = WatchForOwnerChange, QObject *parent = nullptr); ~QDBusServiceWatcher(); QStringList watchedServices() const; diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 1a96d900b4..b69e21b378 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -56,7 +56,7 @@ class Q_DBUS_EXPORT QDBusVirtualObject : public QObject { Q_OBJECT public: - explicit QDBusVirtualObject(QObject *parent = Q_NULLPTR); + explicit QDBusVirtualObject(QObject *parent = nullptr); virtual ~QDBusVirtualObject(); virtual QString introspect(const QString &path) const = 0; -- cgit v1.2.3