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/gui/accessible/qaccessible.h | 4 ++-- src/gui/accessible/qaccessiblebridge.h | 2 +- src/gui/accessible/qaccessiblecache.cpp | 2 +- src/gui/accessible/qaccessibleplugin.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/accessible') diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 27756d764d..1309f17efd 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -511,7 +511,7 @@ public: virtual void virtual_hook(int id, void *data); virtual void *interface_cast(QAccessible::InterfaceType) - { return Q_NULLPTR; } + { return nullptr; } protected: friend class QAccessibleCache; @@ -682,7 +682,7 @@ public: } inline QAccessibleEvent(QAccessibleInterface *iface, QAccessible::Event typ) - : m_type(typ), m_object(Q_NULLPTR) + : m_type(typ), m_object(nullptr) { Q_ASSERT(iface); Q_ASSERT(m_type != QAccessible::ValueChanged); diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h index 7429716e65..168889135b 100644 --- a/src/gui/accessible/qaccessiblebridge.h +++ b/src/gui/accessible/qaccessiblebridge.h @@ -66,7 +66,7 @@ class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject { Q_OBJECT public: - explicit QAccessibleBridgePlugin(QObject *parent = Q_NULLPTR); + explicit QAccessibleBridgePlugin(QObject *parent = nullptr); ~QAccessibleBridgePlugin(); virtual QAccessibleBridge *create(const QString &key) = 0; diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp index 097634c0a3..f4242036ce 100644 --- a/src/gui/accessible/qaccessiblecache.cpp +++ b/src/gui/accessible/qaccessiblecache.cpp @@ -54,7 +54,7 @@ static QAccessibleCache *accessibleCache = nullptr; static void cleanupAccessibleCache() { delete accessibleCache; - accessibleCache = Q_NULLPTR; + accessibleCache = nullptr; } QAccessibleCache *QAccessibleCache::instance() diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h index 09d4c542d3..68e6a839d8 100644 --- a/src/gui/accessible/qaccessibleplugin.h +++ b/src/gui/accessible/qaccessibleplugin.h @@ -60,7 +60,7 @@ class Q_GUI_EXPORT QAccessiblePlugin : public QObject { Q_OBJECT public: - explicit QAccessiblePlugin(QObject *parent = Q_NULLPTR); + explicit QAccessiblePlugin(QObject *parent = nullptr); ~QAccessiblePlugin(); virtual QAccessibleInterface *create(const QString &key, QObject *object) = 0; -- cgit v1.2.3