diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:04 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-26 15:45:33 +0000 |
commit | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (patch) | |
tree | 5a9f20aced2da3e4cc6055cae7156e121f4210d0 /src/plugins/shellintegration | |
parent | 62c058f83add9f559f09cf74bc50f721ed75d76a (diff) |
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>
Diffstat (limited to 'src/plugins/shellintegration')
-rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp | 8 | ||||
-rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp index 502b17c0d..fee812501 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp @@ -55,8 +55,8 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { QWaylandIviShellIntegration::QWaylandIviShellIntegration() - : m_iviApplication(Q_NULLPTR) - , m_iviController(Q_NULLPTR) + : m_iviApplication(nullptr) + , m_iviController(nullptr) , m_lastSurfaceId(0) , m_surfaceNumber(0) , m_useEnvSurfaceId(false) @@ -129,11 +129,11 @@ uint32_t QWaylandIviShellIntegration::getNextUniqueSurfaceId() QWaylandShellSurface *QWaylandIviShellIntegration::createShellSurface(QWaylandWindow *window) { if (!m_iviApplication) - return Q_NULLPTR; + return nullptr; uint32_t surfaceId = getNextUniqueSurfaceId(); if (surfaceId == 0) - return Q_NULLPTR; + return nullptr; struct ivi_surface *surface = m_iviApplication->surface_create(surfaceId, window->object()); if (!m_iviController) diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp index a16518cc3..335aa852c 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp @@ -52,7 +52,7 @@ QWaylandIviSurface::QWaylandIviSurface(struct ::ivi_surface *ivi_surface, QWayla : QtWayland::ivi_surface(ivi_surface) , QWaylandShellSurface(window) , m_window(window) - , m_extendedWindow(Q_NULLPTR) + , m_extendedWindow(nullptr) { createExtendedSurface(window); } @@ -63,7 +63,7 @@ QWaylandIviSurface::QWaylandIviSurface(struct ::ivi_surface *ivi_surface, QWayla , QWaylandShellSurface(window) , QtWayland::ivi_controller_surface(iviControllerSurface) , m_window(window) - , m_extendedWindow(Q_NULLPTR) + , m_extendedWindow(nullptr) { createExtendedSurface(window); } |