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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index 1afe2f7af5..953495a18a 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -58,7 +58,7 @@ public:
     }
 
     struct Element {
-        Element() : name(Q_NULLPTR), type(0) {}
+        Element() : name(nullptr), type(0) {}
         Element(const char *n, int t) : name(n), type(t) {}
 
         const char *name;
@@ -130,12 +130,12 @@ int QTestTable::elementTypeId(int index) const
 
 const char *QTestTable::dataTag(int index) const
 {
-    return size_t(index) < d->elementList.size() ? d->elementList[index].name : Q_NULLPTR;
+    return size_t(index) < d->elementList.size() ? d->elementList[index].name : nullptr;
 }
 
 QTestData *QTestTable::testData(int index) const
 {
-    return size_t(index) < d->dataList.size() ? d->dataList[index] : Q_NULLPTR;
+    return size_t(index) < d->dataList.size() ? d->dataList[index] : nullptr;
 }
 
 class NamePredicate : public std::unary_function<QTestTablePrivate::Element, bool>