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, 4 insertions, 4 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index fd68bbe461..7e7f016bf6 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1387,7 +1387,7 @@ void TestMethods::invokeTests(QObject *testObject) const
 
         if (!QTestResult::skipCurrentTest() && !previousFailed) {
             for (int i = 0, count = int(m_methods.size()); i < count; ++i) {
-                const char *data = Q_NULLPTR;
+                const char *data = nullptr;
                 if (i < QTest::testTags.size() && !QTest::testTags.at(i).isEmpty())
                     data = qstrdup(QTest::testTags.at(i).toLatin1().constData());
                 const bool ok = invokeTest(i, data, watchDog.data());
@@ -1532,7 +1532,7 @@ class DebugSymbolResolver
     Q_DISABLE_COPY(DebugSymbolResolver)
 public:
     struct Symbol {
-        Symbol() : name(Q_NULLPTR), address(0) {}
+        Symbol() : name(nullptr), address(0) {}
 
         const char *name; // Must be freed by caller.
         DWORD64 address;
@@ -1580,11 +1580,11 @@ void DebugSymbolResolver::cleanup()
     if (m_dbgHelpLib)
         FreeLibrary(m_dbgHelpLib);
     m_dbgHelpLib = 0;
-    m_symFromAddr = Q_NULLPTR;
+    m_symFromAddr = nullptr;
 }
 
 DebugSymbolResolver::DebugSymbolResolver(HANDLE process)
-    : m_process(process), m_dbgHelpLib(0), m_symFromAddr(Q_NULLPTR)
+    : m_process(process), m_dbgHelpLib(0), m_symFromAddr(nullptr)
 {
     bool success = false;
     m_dbgHelpLib = LoadLibraryW(L"dbghelp.dll");