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>

10 files changed, 27 insertions, 27 deletions

diff --git a/src/plugins/platforms/haiku/main.cpp b/src/plugins/platforms/haiku/main.cpp
index 02168d0165..841891970d 100644
--- a/src/plugins/platforms/haiku/main.cpp
+++ b/src/plugins/platforms/haiku/main.cpp
@@ -47,7 +47,7 @@ QPlatformIntegration *QHaikuIntegrationPlugin::create(const QString& system, con
     if (!system.compare(QLatin1String("haiku"), Qt::CaseInsensitive))
         return new QHaikuIntegration(paramList);
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/haiku/qhaikubuffer.cpp b/src/plugins/platforms/haiku/qhaikubuffer.cpp
index c6f6ffe6bc..f25ddef86b 100644
--- a/src/plugins/platforms/haiku/qhaikubuffer.cpp
+++ b/src/plugins/platforms/haiku/qhaikubuffer.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 QHaikuBuffer::QHaikuBuffer()
-    : m_buffer(Q_NULLPTR)
+    : m_buffer(nullptr)
 {
 }
 
@@ -63,12 +63,12 @@ BBitmap* QHaikuBuffer::nativeBuffer() const
 
 const QImage *QHaikuBuffer::image() const
 {
-    return (m_buffer != Q_NULLPTR) ? &m_image : Q_NULLPTR;
+    return (m_buffer != nullptr) ? &m_image : nullptr;
 }
 
 QImage *QHaikuBuffer::image()
 {
-    return (m_buffer != Q_NULLPTR) ? &m_image : Q_NULLPTR;
+    return (m_buffer != nullptr) ? &m_image : nullptr;
 }
 
 QRect QHaikuBuffer::rect() const
diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
index 774da4432a..20519e21d0 100644
--- a/src/plugins/platforms/haiku/qhaikuclipboard.cpp
+++ b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
@@ -47,8 +47,8 @@
 #include <Clipboard.h>
 
 QHaikuClipboard::QHaikuClipboard()
-    : m_systemMimeData(Q_NULLPTR)
-    , m_userMimeData(Q_NULLPTR)
+    : m_systemMimeData(nullptr)
+    , m_userMimeData(nullptr)
 {
     if (be_clipboard)
         be_clipboard->StartWatching(BMessenger(this));
@@ -81,12 +81,12 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode)
 
     const BMessage *clipboard = be_clipboard->Data();
     if (clipboard) {
-        char *name = Q_NULLPTR;
+        char *name = nullptr;
         uint32 type = 0;
         int32 count = 0;
 
         for (int i = 0; clipboard->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++) {
-            const void *data = Q_NULLPTR;
+            const void *data = nullptr;
             int32 dataLen = 0;
 
             const status_t status = clipboard->FindData(name, B_MIME_TYPE, &data, &dataLen);
@@ -162,7 +162,7 @@ void QHaikuClipboard::MessageReceived(BMessage* message)
 {
     if (message->what == B_CLIPBOARD_CHANGED) {
         delete m_userMimeData;
-        m_userMimeData = Q_NULLPTR;
+        m_userMimeData = nullptr;
 
         emitChanged(QClipboard::Clipboard);
     }
diff --git a/src/plugins/platforms/haiku/qhaikuintegration.cpp b/src/plugins/platforms/haiku/qhaikuintegration.cpp
index d46d77ff18..8bd2171794 100644
--- a/src/plugins/platforms/haiku/qhaikuintegration.cpp
+++ b/src/plugins/platforms/haiku/qhaikuintegration.cpp
@@ -87,13 +87,13 @@ QHaikuIntegration::QHaikuIntegration(const QStringList &parameters)
 QHaikuIntegration::~QHaikuIntegration()
 {
     destroyScreen(m_screen);
-    m_screen = Q_NULLPTR;
+    m_screen = nullptr;
 
     delete m_services;
-    m_services = Q_NULLPTR;
+    m_services = nullptr;
 
     delete m_clipboard;
-    m_clipboard = Q_NULLPTR;
+    m_clipboard = nullptr;
 
     be_app->LockLooper();
     be_app->Quit();
diff --git a/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp b/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp
index ee53f693cd..613ae471cb 100644
--- a/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp
+++ b/src/plugins/platforms/haiku/qhaikurasterbackingstore.cpp
@@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE
 
 QHaikuRasterBackingStore::QHaikuRasterBackingStore(QWindow *window)
     : QPlatformBackingStore(window)
-    , m_bitmap(Q_NULLPTR)
+    , m_bitmap(nullptr)
 {
 }
 
 QHaikuRasterBackingStore::~QHaikuRasterBackingStore()
 {
     delete m_bitmap;
-    m_bitmap = Q_NULLPTR;
+    m_bitmap = nullptr;
 }
 
 QPaintDevice *QHaikuRasterBackingStore::paintDevice()
@@ -62,7 +62,7 @@ QPaintDevice *QHaikuRasterBackingStore::paintDevice()
     if (!m_bufferSize.isEmpty() && m_bitmap)
         return m_buffer.image();
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void QHaikuRasterBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
diff --git a/src/plugins/platforms/haiku/qhaikurasterwindow.cpp b/src/plugins/platforms/haiku/qhaikurasterwindow.cpp
index 9834b7cbc7..7e57e67bab 100644
--- a/src/plugins/platforms/haiku/qhaikurasterwindow.cpp
+++ b/src/plugins/platforms/haiku/qhaikurasterwindow.cpp
@@ -211,7 +211,7 @@ void HaikuViewProxy::handleKeyEvent(QEvent::Type type, BMessage *message)
 {
     int32 key = 0;
     uint32 code = 0;
-    const char *bytes = Q_NULLPTR;
+    const char *bytes = nullptr;
     QString text;
 
     if (message) {
@@ -265,7 +265,7 @@ QHaikuRasterWindow::~QHaikuRasterWindow()
     m_window->UnlockLooper();
 
     delete m_view;
-    m_view = Q_NULLPTR;
+    m_view = nullptr;
 }
 
 BView* QHaikuRasterWindow::nativeViewHandle() const
diff --git a/src/plugins/platforms/haiku/qhaikurasterwindow.h b/src/plugins/platforms/haiku/qhaikurasterwindow.h
index fd821be763..24b13aa122 100644
--- a/src/plugins/platforms/haiku/qhaikurasterwindow.h
+++ b/src/plugins/platforms/haiku/qhaikurasterwindow.h
@@ -51,7 +51,7 @@ class HaikuViewProxy : public QObject, public BView
     Q_OBJECT
 
 public:
-    explicit HaikuViewProxy(BWindow *window, QObject *parent = Q_NULLPTR);
+    explicit HaikuViewProxy(BWindow *window, QObject *parent = nullptr);
 
     void MessageReceived(BMessage *message) override;
     void Draw(BRect updateRect) override;
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());
diff --git a/src/plugins/platforms/haiku/qhaikuwindow.cpp b/src/plugins/platforms/haiku/qhaikuwindow.cpp
index 4bea7f7ff6..f8fdf3f92d 100644
--- a/src/plugins/platforms/haiku/qhaikuwindow.cpp
+++ b/src/plugins/platforms/haiku/qhaikuwindow.cpp
@@ -118,12 +118,12 @@ void HaikuWindowProxy::zoomByQt()
 
 QHaikuWindow::QHaikuWindow(QWindow *window)
     : QPlatformWindow(window)
-    , m_window(Q_NULLPTR)
+    , m_window(nullptr)
     , m_windowState(Qt::WindowNoState)
 {
     const QRect rect = initialGeometry(window, window->geometry(), DefaultWindowWidth, DefaultWindowHeight);
 
-    HaikuWindowProxy *haikuWindow = new HaikuWindowProxy(window, rect, Q_NULLPTR);
+    HaikuWindowProxy *haikuWindow = new HaikuWindowProxy(window, rect, nullptr);
     connect(haikuWindow, SIGNAL(moved(QPoint)), SLOT(haikuWindowMoved(QPoint)));
     connect(haikuWindow, SIGNAL(resized(QSize,bool)), SLOT(haikuWindowResized(QSize,bool)));
     connect(haikuWindow, SIGNAL(windowActivated(bool)), SLOT(haikuWindowActivated(bool)));
@@ -145,7 +145,7 @@ QHaikuWindow::~QHaikuWindow()
     m_window->LockLooper();
     m_window->Quit();
 
-    m_window = Q_NULLPTR;
+    m_window = nullptr;
 }
 
 void QHaikuWindow::setGeometry(const QRect &rect)
@@ -330,7 +330,7 @@ void QHaikuWindow::haikuWindowResized(const QSize &size, bool zoomInProgress)
 
 void QHaikuWindow::haikuWindowActivated(bool activated)
 {
-    QWindowSystemInterface::handleWindowActivated(activated ? window() : Q_NULLPTR);
+    QWindowSystemInterface::handleWindowActivated(activated ? window() : nullptr);
 }
 
 void QHaikuWindow::haikuWindowMinimized(bool minimize)
diff --git a/src/plugins/platforms/haiku/qhaikuwindow.h b/src/plugins/platforms/haiku/qhaikuwindow.h
index efa47939a7..bb57742087 100644
--- a/src/plugins/platforms/haiku/qhaikuwindow.h
+++ b/src/plugins/platforms/haiku/qhaikuwindow.h
@@ -51,7 +51,7 @@ class HaikuWindowProxy : public QObject, public BWindow
     Q_OBJECT
 
 public:
-    explicit HaikuWindowProxy(QWindow *window, const QRect &rect, QObject *parent = Q_NULLPTR);
+    explicit HaikuWindowProxy(QWindow *window, const QRect &rect, QObject *parent = nullptr);
 
     void FrameMoved(BPoint pos) override;
     void FrameResized(float width, float height) override;