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/plugins/platforms/haiku/qhaikuscreen.cpp b/src/plugins/platforms/haiku/qhaikuscreen.cpp
index 54951a0af5..2c8abba8aa 100644
--- a/src/plugins/platforms/haiku/qhaikuscreen.cpp
+++ b/src/plugins/platforms/haiku/qhaikuscreen.cpp
@@ -58,10 +58,10 @@ QHaikuScreen::QHaikuScreen()
 QHaikuScreen::~QHaikuScreen()
 {
     delete m_cursor;
-    m_cursor = Q_NULLPTR;
+    m_cursor = nullptr;
 
     delete m_screen;
-    m_screen = Q_NULLPTR;
+    m_screen = nullptr;
 }
 
 QPixmap QHaikuScreen::grabWindow(WId winId, int x, int y, int width, int height) const
@@ -69,8 +69,8 @@ QPixmap QHaikuScreen::grabWindow(WId winId, int x, int y, int width, int height)
     if (width == 0 || height == 0)
         return QPixmap();
 
-    BScreen screen(Q_NULLPTR);
-    BBitmap *bitmap = Q_NULLPTR;
+    BScreen screen(nullptr);
+    BBitmap *bitmap = nullptr;
     screen.GetBitmap(&bitmap);
 
     const BRect frame = (winId ? ((BWindow*)winId)->Frame() : screen.Frame());