summaryrefslogtreecommitdiffstats
path: root/src/plugins/shellintegration
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/shellintegration')
-rw-r--r--src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp8
-rw-r--r--src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp4
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);
}