From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
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 <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 src/widgets/accessible/itemviews_p.h       | 14 +++++++-------
 src/widgets/accessible/qaccessiblemenu.cpp |  2 +-
 src/widgets/accessible/rangecontrols.cpp   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
index 61d0387f9c..683ae9c948 100644
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@@ -180,13 +180,13 @@ public:
     QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role);
 
     void *interface_cast(QAccessible::InterfaceType t) override;
-    QObject *object() const override { return Q_NULLPTR; }
+    QObject *object() const override { return nullptr; }
     QAccessible::Role role() const override;
     QAccessible::State state() const override;
     QRect rect() const override;
     bool isValid() const override;
 
-    QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; }
+    QAccessibleInterface *childAt(int, int) const override { return nullptr; }
     int childCount() const override { return 0; }
     int indexOfChild(const QAccessibleInterface *) const override { return -1; }
 
@@ -234,13 +234,13 @@ public:
     // For header cells, pass the header view in addition
     QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation);
 
-    QObject *object() const override { return Q_NULLPTR; }
+    QObject *object() const override { return nullptr; }
     QAccessible::Role role() const override;
     QAccessible::State state() const override;
     QRect rect() const override;
     bool isValid() const override;
 
-    QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; }
+    QAccessibleInterface *childAt(int, int) const override { return nullptr; }
     int childCount() const override { return 0; }
     int indexOfChild(const QAccessibleInterface *) const override { return -1; }
 
@@ -273,13 +273,13 @@ public:
         :view(view_)
     {}
 
-    QObject *object() const override { return Q_NULLPTR; }
+    QObject *object() const override { return nullptr; }
     QAccessible::Role role() const override { return QAccessible::Pane; }
     QAccessible::State state() const override { return QAccessible::State(); }
     QRect rect() const override { return QRect(); }
     bool isValid() const override { return true; }
 
-    QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; }
+    QAccessibleInterface *childAt(int, int) const override { return nullptr; }
     int childCount() const override { return 0; }
     int indexOfChild(const QAccessibleInterface *) const override { return -1; }
 
@@ -290,7 +290,7 @@ public:
         return QAccessible::queryAccessibleInterface(view);
     }
     QAccessibleInterface *child(int) const override {
-        return Q_NULLPTR;
+        return nullptr;
     }
 
 private:
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index ae50bbaef0..2391f74c2f 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -238,7 +238,7 @@ QObject *QAccessibleMenuItem::object() const
 /*! \reimp */
 QWindow *QAccessibleMenuItem::window() const
 {
-    QWindow *result = Q_NULLPTR;
+    QWindow *result = nullptr;
     if (!m_owner.isNull()) {
         result = m_owner->windowHandle();
         if (!result) {
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index c890c50938..4aa948ed33 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_SPINBOX
 QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w)
-: QAccessibleWidget(w, QAccessible::SpinBox), lineEdit(Q_NULLPTR)
+: QAccessibleWidget(w, QAccessible::SpinBox), lineEdit(nullptr)
 {
     Q_ASSERT(abstractSpinBox());
 }
-- 
cgit v1.2.3