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>
---
 src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp   | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp   | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/plugins/platforms/direct2d')

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
index 643ae877d0..d578a58982 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
@@ -161,7 +161,7 @@ void QWindowsDirect2DDeviceContextSuspender::resume()
 {
     if (m_dc) {
         m_dc->resume();
-        m_dc = Q_NULLPTR;
+        m_dc = nullptr;
     }
 }
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
index ea51135583..97e3a25b86 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
@@ -203,7 +203,7 @@ QWindowsDirect2DIntegration *QWindowsDirect2DIntegration::create(const QStringLi
                     caption.toStdWString().c_str(),
                     MB_OK | MB_ICONERROR);
 
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     QWindowsDirect2DIntegration *integration = new QWindowsDirect2DIntegration(paramList);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index 164429ba30..95fbd37247 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -804,7 +804,7 @@ public:
         const bool alias = !q->antiAliasingEnabled();
 
         QVectorPath::CacheEntry *cacheEntry = path.isCacheable() ? path.lookupCacheData(q)
-                                                                 : Q_NULLPTR;
+                                                                 : nullptr;
 
         if (cacheEntry) {
             D2DVectorPathCache *e = static_cast<D2DVectorPathCache *>(cacheEntry->data);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
index 21294cfb15..f81182e0b1 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
@@ -209,7 +209,7 @@ void QWindowsDirect2DWindow::resizeSwapChain(const QSize &size)
 {
     m_pixmap.reset();
     m_bitmap.reset();
-    m_deviceContext->SetTarget(Q_NULLPTR);
+    m_deviceContext->SetTarget(nullptr);
     m_needsFullFlush = true;
 
     if (!m_swapChain)
@@ -241,7 +241,7 @@ QSharedPointer<QWindowsDirect2DBitmap> QWindowsDirect2DWindow::copyBackBuffer()
         dpiX,                       // FLOAT dpiX;
         dpiY,                       // FLOAT dpiY;
         D2D1_BITMAP_OPTIONS_TARGET, // D2D1_BITMAP_OPTIONS bitmapOptions;
-        Q_NULLPTR                   // _Field_size_opt_(1) ID2D1ColorContext *colorContext;
+        nullptr                   // _Field_size_opt_(1) ID2D1ColorContext *colorContext;
     };
     ComPtr<ID2D1Bitmap1> copy;
     HRESULT hr = m_deviceContext.Get()->CreateBitmap(size, NULL, 0, properties, &copy);
@@ -257,7 +257,7 @@ QSharedPointer<QWindowsDirect2DBitmap> QWindowsDirect2DWindow::copyBackBuffer()
         return null_result;
     }
 
-    return QSharedPointer<QWindowsDirect2DBitmap>(new QWindowsDirect2DBitmap(copy.Get(), Q_NULLPTR));
+    return QSharedPointer<QWindowsDirect2DBitmap>(new QWindowsDirect2DBitmap(copy.Get(), nullptr));
 }
 
 void QWindowsDirect2DWindow::setupBitmap()
-- 
cgit v1.2.3