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>
---
 tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp | 2 +-
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp         | 8 ++++----
 tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp           | 8 ++++----
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp       | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/auto/corelib/kernel')

diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
index 87196eaef1..4584b6ce31 100644
--- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -763,7 +763,7 @@ void tst_QMetaMethod::gadget()
 
     {
         // Call with null should not crash
-        MyGadget *gadget = Q_NULLPTR;
+        MyGadget *gadget = nullptr;
         QString string;
         QVERIFY(!setValueMethod.invokeOnGadget(gadget, Q_ARG(QString, QLatin1String("hi"))));
         QVERIFY(!getValueMethod.invokeOnGadget(gadget, Q_RETURN_ARG(QString, string)));
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 3a52c684d0..a3f3550307 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -6015,7 +6015,7 @@ public:
 
 struct SlotArgFunctor
 {
-    SlotArgFunctor(int *s) : status(s), context(Q_NULLPTR), sender(Q_NULLPTR) {}
+    SlotArgFunctor(int *s) : status(s), context(nullptr), sender(nullptr) {}
     SlotArgFunctor(ContextObject *context, QObject *sender, int *s) : status(s), context(context), sender(sender) {}
     void operator()() { *status = 2; if (context) context->compareSender(sender); }
 
@@ -6453,7 +6453,7 @@ Q_SIGNALS:
 static int countedStructObjectsCount = 0;
 struct CountedStruct
 {
-    CountedStruct() : sender(Q_NULLPTR) { ++countedStructObjectsCount; }
+    CountedStruct() : sender(nullptr) { ++countedStructObjectsCount; }
     CountedStruct(GetSenderObject *sender) : sender(sender) { ++countedStructObjectsCount; }
     CountedStruct(const CountedStruct &o) : sender(o.sender) { ++countedStructObjectsCount; }
     CountedStruct &operator=(const CountedStruct &) { return *this; }
@@ -6769,7 +6769,7 @@ class CountedExceptionThrower : public QObject
     Q_OBJECT
 
 public:
-    explicit CountedExceptionThrower(bool throwException, QObject *parent = Q_NULLPTR)
+    explicit CountedExceptionThrower(bool throwException, QObject *parent = nullptr)
         : QObject(parent)
     {
         if (throwException)
@@ -6855,7 +6855,7 @@ void tst_QObject::exceptions()
         try {
             class ParentObject : public QObject {
             public:
-                explicit ParentObject(QObject *parent = Q_NULLPTR)
+                explicit ParentObject(QObject *parent = nullptr)
                     : QObject(parent)
                 {
                     new CountedExceptionThrower(false, this);
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index e17d8ee38b..343a9384bc 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -754,7 +754,7 @@ void tst_QTimer::recurseOnTimeoutAndStopTimer()
 
 struct CountedStruct
 {
-    CountedStruct(int *count, QThread *t = Q_NULLPTR) : count(count), thread(t) { }
+    CountedStruct(int *count, QThread *t = nullptr) : count(count), thread(t) { }
     ~CountedStruct() { }
     void operator()() const { ++(*count); if (thread) QCOMPARE(QThread::currentThread(), thread); }
 
@@ -763,7 +763,7 @@ struct CountedStruct
 };
 
 static QScopedPointer<QEventLoop> _e;
-static QThread *_t = Q_NULLPTR;
+static QThread *_t = nullptr;
 
 class StaticEventLoop
 {
@@ -827,7 +827,7 @@ void tst_QTimer::singleShotToFunctors()
     _t->quit();
     _t->wait();
     _t->deleteLater();
-    _t = Q_NULLPTR;
+    _t = nullptr;
 
     {
         QObject c3;
@@ -865,7 +865,7 @@ void tst_QTimer::singleShotToFunctors()
     QCOMPARE(count, 5);
 
     _e.reset();
-    _t = Q_NULLPTR;
+    _t = nullptr;
 }
 
 void tst_QTimer::singleShot_chrono()
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 0d45159d09..5d19cb8428 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4927,7 +4927,7 @@ void tst_QVariant::accessSequentialContainerKey()
     {
     QMap<QString, QObject*> mapping;
     QString name = QString::fromLatin1("Seven");
-    mapping.insert(name, Q_NULLPTR);
+    mapping.insert(name, nullptr);
 
     QVariant variant = QVariant::fromValue(mapping);
 
-- 
cgit v1.2.3