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>

19 files changed, 47 insertions, 47 deletions

diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp
index 57a120e48..8ceeeea56 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.cpp
+++ b/src/compositor/compositor_api/qwaylandbufferref.cpp
@@ -185,7 +185,7 @@ bool QWaylandBufferRef::isDestroyed() const
  */
 struct ::wl_resource *QWaylandBufferRef::wl_buffer() const
 {
-    return d->buffer ? d->buffer->waylandBufferHandle() : Q_NULLPTR;
+    return d->buffer ? d->buffer->waylandBufferHandle() : nullptr;
 }
 
 /*!
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index 48675c495..4fb72f9df 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -146,7 +146,7 @@ QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_
     if (!wlClient)
         return 0;
 
-    QWaylandClient *client = Q_NULLPTR;
+    QWaylandClient *client = nullptr;
 
     wl_listener *l = wl_client_get_destroy_listener(wlClient,
         QWaylandClientPrivate::client_destroy_callback);
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 522ef0413..65001a8ca 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -656,7 +656,7 @@ QWaylandOutput *QWaylandCompositor::outputFor(QWindow *window) const
             return output;
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 /*!
@@ -822,7 +822,7 @@ QWaylandSeat *QWaylandCompositor::defaultSeat() const
     Q_D(const QWaylandCompositor);
     if (d->seats.size())
         return d->seats.first();
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 /*!
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 3970ff152..18595a806 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -87,7 +87,7 @@ public:
     void destroySurface(QWaylandSurface *surface);
     void unregisterSurface(QWaylandSurface *surface);
 
-    QWaylandOutput *defaultOutput() const { return outputs.size() ? outputs.first() : Q_NULLPTR; }
+    QWaylandOutput *defaultOutput() const { return outputs.size() ? outputs.first() : nullptr; }
 
     inline QtWayland::ClientBufferIntegration *clientBufferIntegration() const;
     inline QtWayland::ServerBufferIntegration *serverBufferIntegration() const;
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index c30f7b18d..930eae1ae 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -122,7 +122,7 @@ void QWaylandKeyboardPrivate::sendEnter(QWaylandSurface *surface, Resource *keyb
 void QWaylandKeyboardPrivate::focused(QWaylandSurface *surface)
 {
     if (surface && surface->isCursorSurface())
-        surface = Q_NULLPTR;
+        surface = nullptr;
     if (focus != surface) {
         if (focusResource) {
             uint32_t serial = compositor()->nextSerial();
@@ -466,7 +466,7 @@ QWaylandClient *QWaylandKeyboard::focusClient() const
 {
     Q_D(const QWaylandKeyboard);
     if (!d->focusResource)
-        return Q_NULLPTR;
+        return nullptr;
     return QWaylandClient::fromWlClient(compositor(), d->focusResource->client());
 }
 
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index cbd7fe776..3f3009385 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -104,8 +104,8 @@ static QtWaylandServer::wl_output::transform toWlTransform(const QWaylandOutput:
 
 QWaylandOutputPrivate::QWaylandOutputPrivate()
     : QtWaylandServer::wl_output()
-    , compositor(Q_NULLPTR)
-    , window(Q_NULLPTR)
+    , compositor(nullptr)
+    , window(nullptr)
     , currentMode(-1)
     , preferredMode(-1)
     , subpixel(QWaylandOutput::SubpixelUnknown)
@@ -319,7 +319,7 @@ struct ::wl_resource *QWaylandOutput::resourceForClient(QWaylandClient *client)
     if (r)
         return r->handle;
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 /*!
@@ -989,7 +989,7 @@ void QWaylandOutput::handleSetHeight(int newHeight)
 void QWaylandOutput::handleWindowDestroyed()
 {
     Q_D(QWaylandOutput);
-    d->window = Q_NULLPTR;
+    d->window = nullptr;
     emit windowDestroyed();
 }
 
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index 594fe1291..dab6daf73 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -87,7 +87,7 @@ struct QWaylandSurfaceViewMapper
             if (surface && surface->primaryView() == views.at(i))
                 return views.at(i);
         }
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     QWaylandSurface *surface;
diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp
index 267b5d980..d1f3991ae 100644
--- a/src/compositor/compositor_api/qwaylandpointer.cpp
+++ b/src/compositor/compositor_api/qwaylandpointer.cpp
@@ -75,7 +75,7 @@ void QWaylandPointerPrivate::pointer_set_cursor(wl_pointer::Resource *resource,
     Q_UNUSED(serial);
 
     if (!surface) {
-        seat->cursorSurfaceRequest(Q_NULLPTR, 0, 0);
+        seat->cursorSurfaceRequest(nullptr, 0, 0);
         return;
     }
 
@@ -203,7 +203,7 @@ void QWaylandPointer::sendMouseMoveEvent(QWaylandView *view, const QPointF &loca
 {
     Q_D(QWaylandPointer);
     if (view && (!view->surface() || view->surface()->isCursorSurface()))
-        view = Q_NULLPTR;
+        view = nullptr;
     d->seat->setMouseFocus(view);
     d->localPosition = localPos;
     d->spacePosition = outputSpacePos;
@@ -314,7 +314,7 @@ struct wl_resource *QWaylandPointer::focusResource() const
 {
     Q_D(const QWaylandPointer);
     if (!d->focusResource)
-        return Q_NULLPTR;
+        return nullptr;
 
     return d->focusResource;
 }
@@ -371,7 +371,7 @@ void QWaylandPointer::focusDestroyed(void *data)
     Q_UNUSED(data)
     d->focusDestroyListener.reset();
 
-    d->seat->setMouseFocus(Q_NULLPTR);
+    d->seat->setMouseFocus(nullptr);
     d->focusResource = 0;
     d->buttonCount = 0;
 }
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index bfd252753..b22a75a12 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -384,7 +384,7 @@ QWaylandQuickItem::~QWaylandQuickItem()
 QWaylandCompositor *QWaylandQuickItem::compositor() const
 {
     Q_D(const QWaylandQuickItem);
-    return d->view->surface() ? d->view->surface()->compositor() : Q_NULLPTR;
+    return d->view->surface() ? d->view->surface()->compositor() : nullptr;
 }
 
 /*!
@@ -595,7 +595,7 @@ void QWaylandQuickItem::hoverLeaveEvent(QHoverEvent *event)
     Q_D(QWaylandQuickItem);
     if (d->shouldSendInputEvents()) {
         QWaylandSeat *seat = compositor()->seatFor(event);
-        seat->setMouseFocus(Q_NULLPTR);
+        seat->setMouseFocus(nullptr);
     } else {
         event->ignore();
     }
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h
index 30b96c4f6..98af6ba7c 100644
--- a/src/compositor/compositor_api/qwaylandquickitem_p.h
+++ b/src/compositor/compositor_api/qwaylandquickitem_p.h
@@ -109,9 +109,9 @@ class QWaylandQuickItemPrivate : public QQuickItemPrivate
 public:
     QWaylandQuickItemPrivate()
         : QQuickItemPrivate()
-        , view(Q_NULLPTR)
-        , oldSurface(Q_NULLPTR)
-        , provider(Q_NULLPTR)
+        , view(nullptr)
+        , oldSurface(nullptr)
+        , provider(nullptr)
         , paintEnabled(true)
         , touchEventsEnabled(true)
         , inputEventsEnabled(true)
@@ -119,7 +119,7 @@ public:
         , newTexture(false)
         , focusOnClick(true)
         , sizeFollowsSurface(true)
-        , connectedWindow(Q_NULLPTR)
+        , connectedWindow(nullptr)
         , origin(QWaylandSurface::OriginTopLeft)
     {
     }
diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp
index 60a9c60d2..e508e0877 100644
--- a/src/compositor/compositor_api/qwaylandseat.cpp
+++ b/src/compositor/compositor_api/qwaylandseat.cpp
@@ -65,7 +65,7 @@ QWaylandSeatPrivate::QWaylandSeatPrivate(QWaylandSeat *seat)
     , QtWaylandServer::wl_seat()
     , isInitialized(false)
     , compositor(nullptr)
-    , mouseFocus(Q_NULLPTR)
+    , mouseFocus(nullptr)
     , keyboardFocus(nullptr)
     , capabilities()
 #if QT_CONFIG(wayland_datadevice)
@@ -370,7 +370,7 @@ QWaylandSurface *QWaylandSeat::keyboardFocus() const
 {
     Q_D(const QWaylandSeat);
     if (d->keyboard.isNull() || !d->keyboard->focus())
-        return Q_NULLPTR;
+        return nullptr;
 
     return d->keyboard->focus();
 }
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 6a6d65206..bfe7b0c32 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -127,9 +127,9 @@ QList<QWaylandSurfacePrivate *> QWaylandSurfacePrivate::uninitializedSurfaces;
 
 QWaylandSurfacePrivate::QWaylandSurfacePrivate()
     : QtWaylandServer::wl_surface()
-    , compositor(Q_NULLPTR)
+    , compositor(nullptr)
     , refCount(1)
-    , client(Q_NULLPTR)
+    , client(nullptr)
     , role(0)
     , inputRegion(infiniteRegion())
     , bufferScale(1)
@@ -139,7 +139,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate()
     , isInitialized(false)
     , contentOrientation(Qt::PrimaryOrientation)
 #if QT_CONFIG(im)
-    , inputMethodControl(Q_NULLPTR)
+    , inputMethodControl(nullptr)
 #endif
     , subsurface(0)
 {
@@ -459,7 +459,7 @@ QWaylandClient *QWaylandSurface::client() const
 {
     Q_D(const QWaylandSurface);
     if (isDestroyed() || !compositor() || !compositor()->clients().contains(d->client))
-        return Q_NULLPTR;
+        return nullptr;
 
     return d->client;
 }
@@ -603,7 +603,7 @@ void QWaylandSurface::sendFrameCallbacks()
     int i = 0;
     while (i < d->frameCallbacks.size()) {
         if (d->frameCallbacks.at(i)->canSend) {
-            d->frameCallbacks.at(i)->surface = Q_NULLPTR;
+            d->frameCallbacks.at(i)->surface = nullptr;
             d->frameCallbacks.at(i)->send(time);
             d->frameCallbacks.removeAt(i);
         } else {
@@ -712,7 +712,7 @@ QWaylandView *QWaylandSurface::primaryView() const
 {
     Q_D(const QWaylandSurface);
     if (d->views.isEmpty())
-        return Q_NULLPTR;
+        return nullptr;
     return d->views.first();
 }
 
@@ -804,7 +804,7 @@ QWaylandSurfaceRole *QWaylandSurface::role() const
 
 QWaylandSurfacePrivate *QWaylandSurfacePrivate::get(QWaylandSurface *surface)
 {
-    return surface ? surface->d_func() : Q_NULLPTR;
+    return surface ? surface->d_func() : nullptr;
 }
 
 void QWaylandSurfacePrivate::ref()
diff --git a/src/compositor/compositor_api/qwaylandsurfacegrabber.h b/src/compositor/compositor_api/qwaylandsurfacegrabber.h
index ce1e397e5..c28614f37 100644
--- a/src/compositor/compositor_api/qwaylandsurfacegrabber.h
+++ b/src/compositor/compositor_api/qwaylandsurfacegrabber.h
@@ -60,7 +60,7 @@ public:
         RendererNotReady,
     };
     Q_ENUM(Error)
-    explicit QWaylandSurfaceGrabber(QWaylandSurface *surface, QObject *parent = Q_NULLPTR);
+    explicit QWaylandSurfaceGrabber(QWaylandSurface *surface, QObject *parent = nullptr);
 
     QWaylandSurface *surface() const;
     void grab();
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp
index 1ce923d48..3114fce0b 100644
--- a/src/compositor/compositor_api/qwaylandview.cpp
+++ b/src/compositor/compositor_api/qwaylandview.cpp
@@ -55,7 +55,7 @@ void QWaylandViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface)
     Q_Q(QWaylandView);
     Q_ASSERT(surface == this->surface);
 
-    q->setSurface(Q_NULLPTR);
+    q->setSurface(nullptr);
     emit q->surfaceDestroyed();
 }
 
@@ -101,7 +101,7 @@ QWaylandView::~QWaylandView()
             QWaylandOutputPrivate::get(d->output)->removeView(this, d->surface);
         QWaylandSeat *i = d->surface->compositor()->defaultSeat();
         if (i->mouseFocus() == this)
-            i->setMouseFocus(Q_NULLPTR);
+            i->setMouseFocus(nullptr);
 
         QWaylandSurfacePrivate::get(d->surface)->derefView(this);
     }
@@ -377,7 +377,7 @@ struct wl_resource *QWaylandView::surfaceResource() const
 {
     Q_D(const QWaylandView);
     if (!d->surface)
-        return Q_NULLPTR;
+        return nullptr;
     return d->surface->resource();
 }
 
diff --git a/src/compositor/compositor_api/qwaylandview_p.h b/src/compositor/compositor_api/qwaylandview_p.h
index 326e0b297..a2bf219d7 100644
--- a/src/compositor/compositor_api/qwaylandview_p.h
+++ b/src/compositor/compositor_api/qwaylandview_p.h
@@ -69,9 +69,9 @@ public:
     static QWaylandViewPrivate *get(QWaylandView *view) { return view->d_func(); }
 
     QWaylandViewPrivate()
-        : renderObject(Q_NULLPTR)
-        , surface(Q_NULLPTR)
-        , output(Q_NULLPTR)
+        : renderObject(nullptr)
+        , surface(nullptr)
+        , output(nullptr)
         , nextBufferCommitted(false)
         , bufferLocked(false)
         , broadcastRequestedPositionChanged(false)
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index 038e41b1f..7a7262b2e 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -104,8 +104,8 @@ void QWaylandWlShellPrivate::unregisterShellSurface(QWaylandWlShellSurface *shel
 QWaylandWlShellSurfacePrivate::QWaylandWlShellSurfacePrivate()
     : QWaylandCompositorExtensionPrivate()
     , wl_shell_surface()
-    , m_shell(Q_NULLPTR)
-    , m_surface(Q_NULLPTR)
+    , m_shell(nullptr)
+    , m_surface(nullptr)
     , m_windowType(Qt::WindowType::Window)
 {
 }
@@ -195,7 +195,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_fullscreen(Resource *resou
     Q_Q(QWaylandWlShellSurface);
     QWaylandOutput *output = output_resource
             ? QWaylandOutput::fromResource(output_resource)
-            : Q_NULLPTR;
+            : nullptr;
     setWindowType(Qt::WindowType::Window);
     emit q->setFullScreen(QWaylandWlShellSurface::FullScreenMethod(method), framerate, output);
 }
@@ -220,7 +220,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_maximized(Resource *resour
     Q_Q(QWaylandWlShellSurface);
     QWaylandOutput *output = output_resource
             ? QWaylandOutput::fromResource(output_resource)
-            : Q_NULLPTR;
+            : nullptr;
     setWindowType(Qt::WindowType::Window);
     emit q->setMaximized(output);
 }
diff --git a/src/compositor/global/qwaylandcompositorextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp
index 7b44dbde6..ee117bbae 100644
--- a/src/compositor/global/qwaylandcompositorextension.cpp
+++ b/src/compositor/global/qwaylandcompositorextension.cpp
@@ -146,7 +146,7 @@ QWaylandObject::QWaylandObject(QObjectPrivate &d, QObject *parent)
 QWaylandObject::~QWaylandObject()
 {
     foreach (QWaylandCompositorExtension *extension, extension_vector)
-        QWaylandCompositorExtensionPrivate::get(extension)->extension_container = Q_NULLPTR;
+        QWaylandCompositorExtensionPrivate::get(extension)->extension_container = nullptr;
 }
 
 QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name)
@@ -155,7 +155,7 @@ QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name)
         if (extension_vector.at(i)->extensionInterface()->name == name)
             return extension_vector.at(i);
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *interface)
@@ -164,7 +164,7 @@ QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *inter
         if (extension_vector.at(i)->extensionInterface() == interface)
             return extension_vector.at(i);
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QList<QWaylandCompositorExtension *> QWaylandObject::extensions() const
diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h
index 73f8aab36..48fce0c96 100644
--- a/src/compositor/global/qwaylandcompositorextension.h
+++ b/src/compositor/global/qwaylandcompositorextension.h
@@ -114,7 +114,7 @@ public:
 
     static T *findIn(QWaylandObject *container)
     {
-        if (!container) return Q_NULLPTR;
+        if (!container) return nullptr;
         return qobject_cast<T *>(container->extension(T::interfaceName()));
     }
 
diff --git a/src/compositor/global/qwaylandcompositorextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h
index 56889cfab..68f817aa6 100644
--- a/src/compositor/global/qwaylandcompositorextension_p.h
+++ b/src/compositor/global/qwaylandcompositorextension_p.h
@@ -64,7 +64,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionPrivate : public QO
 public:
     QWaylandCompositorExtensionPrivate()
         : QObjectPrivate()
-        , extension_container(Q_NULLPTR)
+        , extension_container(nullptr)
         , initialized(false)
     {
     }