Replace Q_NULLPTR with nullptr

Change-Id: I9699a957430b8d3574ce29acb91b7ada9ea6209b
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

13 files changed, 20 insertions, 20 deletions

diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
index f1f0cf932..7776c6158 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
@@ -86,8 +86,8 @@ public:
         EglConfig,
         EglContext
     };
-    virtual void *nativeResource(NativeResource /*resource*/) { return Q_NULLPTR; }
-    virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return Q_NULLPTR; }
+    virtual void *nativeResource(NativeResource /*resource*/) { return nullptr; }
+    virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; }
 };
 
 }
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
index 94eca3262..8f573064e 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
@@ -90,7 +90,7 @@ QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(co
     if (QWaylandInputDeviceIntegration *ret = qLoadPlugin<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(loader(), name, args))
         return ret;
 #endif
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 }
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
index 7caa247e5..6ce2b7bbc 100644
--- a/src/client/qwaylandcursor.cpp
+++ b/src/client/qwaylandcursor.cpp
@@ -92,7 +92,7 @@ struct wl_cursor_image *QWaylandCursor::cursorImage(Qt::CursorShape newShape)
         waylandCursor = requestCursor((WaylandCursor)newShape);
     } else if (newShape == Qt::BitmapCursor) {
         // cannot create a wl_cursor_image for a CursorShape
-        return Q_NULLPTR;
+        return nullptr;
     } else {
         //TODO: Custom cursor logic (for resize arrows)
     }
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
index 33068c5e9..66f36f75b 100644
--- a/src/client/qwaylanddatadevice.cpp
+++ b/src/client/qwaylanddatadevice.cpp
@@ -97,7 +97,7 @@ void QWaylandDataDevice::setSelectionSource(QWaylandDataSource *source)
 {
     if (source)
         connect(source, &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::selectionSourceCancelled);
-    set_selection(source ? source->object() : Q_NULLPTR, m_inputDevice->serial());
+    set_selection(source ? source->object() : nullptr, m_inputDevice->serial());
     m_selectionSource.reset(source);
 }
 
@@ -160,7 +160,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
     m_dragWindow = QWaylandWindow::fromWlSurface(surface)->window();
     m_dragPoint = calculateDragPosition(x, y, m_dragWindow);
 
-    QMimeData *dragData = Q_NULLPTR;
+    QMimeData *dragData = nullptr;
     Qt::DropActions supportedActions;
 
     m_dragOffer.reset(static_cast<QWaylandDataOffer *>(wl_data_offer_get_user_data(id)));
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 86cfe1a0d..b2372f088 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -136,8 +136,8 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
     , mLastInputSerial(0)
     , mLastInputDevice(0)
     , mLastInputWindow(0)
-    , mLastKeyboardFocus(Q_NULLPTR)
-    , mSyncCallback(Q_NULLPTR)
+    , mLastKeyboardFocus(nullptr)
+    , mSyncCallback(nullptr)
 {
     qRegisterMetaType<uint32_t>("uint32_t");
 
@@ -446,7 +446,7 @@ void QWaylandDisplay::handleWaylandSync()
     // This callback is used to set the window activation because we may get an activate/deactivate
     // pair, and the latter one would be lost in the QWindowSystemInterface queue, if we issue the
     // handleWindowActivated() calls immediately.
-    QWindow *activeWindow = mActiveWindows.empty() ? Q_NULLPTR : mActiveWindows.last()->window();
+    QWindow *activeWindow = mActiveWindows.empty() ? nullptr : mActiveWindows.last()->window();
     if (activeWindow != QGuiApplication::focusWindow())
         QWindowSystemInterface::handleWindowActivated(activeWindow);
 }
@@ -456,7 +456,7 @@ const wl_callback_listener QWaylandDisplay::syncCallbackListener = {
         Q_UNUSED(time);
         wl_callback_destroy(callback);
         QWaylandDisplay *display = static_cast<QWaylandDisplay *>(data);
-        display->mSyncCallback = Q_NULLPTR;
+        display->mSyncCallback = nullptr;
         display->handleWaylandSync();
     }
 };
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 400f3517c..03aedd6b6 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -122,7 +122,7 @@ public:
 
 QWaylandIntegration::QWaylandIntegration()
     : mClientBufferIntegration(0)
-    , mInputDeviceIntegration(Q_NULLPTR)
+    , mInputDeviceIntegration(nullptr)
     , mFontDb(new QGenericUnixFontDatabase())
     , mNativeInterface(new QWaylandNativeInterface(this))
 #if QT_CONFIG(accessibility)
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
index 2085bc597..a7bc24165 100644
--- a/src/client/qwaylandshmbackingstore.cpp
+++ b/src/client/qwaylandshmbackingstore.cpp
@@ -171,7 +171,7 @@ QWaylandShmBackingStore::QWaylandShmBackingStore(QWindow *window)
 QWaylandShmBackingStore::~QWaylandShmBackingStore()
 {
     if (QWaylandWindow *w = waylandWindow())
-        w->setBackingStore(Q_NULLPTR);
+        w->setBackingStore(nullptr);
 
 //    if (mFrontBuffer == waylandWindow()->attached())
 //        waylandWindow()->attach(0);
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 97596896f..cd846c0ba 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -95,7 +95,7 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
     , mScale(1)
     , mState(Qt::WindowNoState)
     , mMask()
-    , mBackingStore(Q_NULLPTR)
+    , mBackingStore(nullptr)
     , mUpdateRequested(false)
 {
     static WId id = 1;
@@ -240,7 +240,7 @@ bool QWaylandWindow::shouldCreateShellSurface() const
 
 bool QWaylandWindow::shouldCreateSubSurface() const
 {
-    return QPlatformWindow::parent() != Q_NULLPTR;
+    return QPlatformWindow::parent() != nullptr;
 }
 
 void QWaylandWindow::reset(bool sendDestroyEvent)
diff --git a/src/client/qwaylandwlshellintegration.cpp b/src/client/qwaylandwlshellintegration.cpp
index e945745e2..e51637108 100644
--- a/src/client/qwaylandwlshellintegration.cpp
+++ b/src/client/qwaylandwlshellintegration.cpp
@@ -55,7 +55,7 @@ QWaylandWlShellIntegration *QWaylandWlShellIntegration::create(QWaylandDisplay *
 }
 
 QWaylandWlShellIntegration::QWaylandWlShellIntegration(QWaylandDisplay *display)
-    : m_wlShell(Q_NULLPTR)
+    : m_wlShell(nullptr)
 {
     Q_FOREACH (QWaylandDisplay::RegistryGlobal global, display->globals()) {
         if (global.interface == QLatin1String("wl_shell")) {
diff --git a/src/client/qwaylandwlshellsurface.cpp b/src/client/qwaylandwlshellsurface.cpp
index 77434e98b..cc5163a22 100644
--- a/src/client/qwaylandwlshellsurface.cpp
+++ b/src/client/qwaylandwlshellsurface.cpp
@@ -58,7 +58,7 @@ QWaylandWlShellSurface::QWaylandWlShellSurface(struct ::wl_shell_surface *shell_
     , m_window(window)
     , m_maximized(false)
     , m_fullscreen(false)
-    , m_extendedWindow(Q_NULLPTR)
+    , m_extendedWindow(nullptr)
 {
     if (window->display()->windowExtension())
         m_extendedWindow = new QWaylandExtendedSurface(window);
diff --git a/src/client/qwaylandxdgshellintegration.cpp b/src/client/qwaylandxdgshellintegration.cpp
index 04b8e8048..7c40d2dd7 100644
--- a/src/client/qwaylandxdgshellintegration.cpp
+++ b/src/client/qwaylandxdgshellintegration.cpp
@@ -57,7 +57,7 @@ QWaylandXdgShellIntegration *QWaylandXdgShellIntegration::create(QWaylandDisplay
 }
 
 QWaylandXdgShellIntegration::QWaylandXdgShellIntegration(QWaylandDisplay *display)
-    : m_xdgShell(Q_NULLPTR)
+    : m_xdgShell(nullptr)
 {
     Q_FOREACH (QWaylandDisplay::RegistryGlobal global, display->globals()) {
         if (global.interface == QLatin1String("xdg_shell")) {
diff --git a/src/client/qwaylandxdgsurface.cpp b/src/client/qwaylandxdgsurface.cpp
index fe8761e5b..60266af68 100644
--- a/src/client/qwaylandxdgsurface.cpp
+++ b/src/client/qwaylandxdgsurface.cpp
@@ -61,7 +61,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, QWaylandWindow *
     , m_minimized(false)
     , m_fullscreen(false)
     , m_active(false)
-    , m_extendedWindow(Q_NULLPTR)
+    , m_extendedWindow(nullptr)
 {
     if (window->display()->windowExtension())
         m_extendedWindow = new QWaylandExtendedSurface(window);
@@ -105,7 +105,7 @@ void QWaylandXdgSurface::setMaximized()
 void QWaylandXdgSurface::setFullscreen()
 {
     if (!m_fullscreen)
-        set_fullscreen(Q_NULLPTR);
+        set_fullscreen(nullptr);
 }
 
 void QWaylandXdgSurface::setNormal()
diff --git a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
index 09c62339b..c5a505bbe 100644
--- a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
+++ b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
@@ -90,7 +90,7 @@ QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString
     if (QWaylandShellIntegration *ret = qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args))
         return ret;
 #endif
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 }