summaryrefslogtreecommitdiffstats
path: root/examples/wayland/qwindow-compositor
diff options
context:
space:
mode:
Diffstat (limited to 'examples/wayland/qwindow-compositor')
-rw-r--r--examples/wayland/qwindow-compositor/compositor.cpp4
-rw-r--r--examples/wayland/qwindow-compositor/window.cpp10
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/wayland/qwindow-compositor/compositor.cpp b/examples/wayland/qwindow-compositor/compositor.cpp
index 64f468262..11516a182 100644
--- a/examples/wayland/qwindow-compositor/compositor.cpp
+++ b/examples/wayland/qwindow-compositor/compositor.cpp
@@ -69,7 +69,7 @@
View::View(Compositor *compositor)
: m_compositor(compositor)
, m_textureTarget(GL_TEXTURE_2D)
- , m_texture(0)
+ , m_texture(nullptr)
, m_wlShellSurface(nullptr)
, m_xdgSurface(nullptr)
, m_xdgPopup(nullptr)
@@ -502,7 +502,7 @@ void Compositor::startDrag()
void Compositor::handleDrag(View *target, QMouseEvent *me)
{
QPointF pos = me->localPos();
- QWaylandSurface *surface = 0;
+ QWaylandSurface *surface = nullptr;
if (target) {
pos -= target->position();
surface = target->surface();
diff --git a/examples/wayland/qwindow-compositor/window.cpp b/examples/wayland/qwindow-compositor/window.cpp
index c795f70a1..9d5b4395e 100644
--- a/examples/wayland/qwindow-compositor/window.cpp
+++ b/examples/wayland/qwindow-compositor/window.cpp
@@ -60,10 +60,10 @@
#include <QtWaylandCompositor/qwaylandseat.h>
Window::Window()
- : m_backgroundTexture(0)
- , m_compositor(0)
+ : m_backgroundTexture(nullptr)
+ , m_compositor(nullptr)
, m_grabState(NoGrab)
- , m_dragIconView(0)
+ , m_dragIconView(nullptr)
{
}
@@ -162,7 +162,7 @@ void Window::paintGL()
View *Window::viewAt(const QPointF &point)
{
- View *ret = 0;
+ View *ret = nullptr;
Q_FOREACH (View *view, m_compositor->views()) {
if (view == m_dragIconView)
continue;
@@ -226,7 +226,7 @@ void Window::mouseReleaseEvent(QMouseEvent *e)
View *view = viewAt(e->localPos());
m_compositor->handleDrag(view, e);
}
- m_mouseView = 0;
+ m_mouseView = nullptr;
m_grabState = NoGrab;
}
}