From bd6a5c4669801d7c86ffe2f8664dcfe0b4b7a906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 14 Aug 2015 11:47:08 +0200 Subject: Remove the QtWayland::Output class and add QWaylandOutputPrivate. Also make sure no other class holds a pointer to the QWaylandOutputPrivate but only to QWaylandOutput Change-Id: I6c5914d5bf9b394c6fbd7e181e603076fbdc79d7 --- src/compositor/compositor_api/qwaylandview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/compositor/compositor_api/qwaylandview.cpp') diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 1dd570d94..c55bd5b5d 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -68,7 +68,7 @@ QWaylandView::~QWaylandView() { Q_D(QWaylandView); if (d->output) - d->output->handle()->removeView(this); + QWaylandOutputPrivate::get(d->output)->removeView(this); if (d->surface) { QWaylandInputDevice *i = d->surface->compositor()->defaultInputDevice(); if (i->mouseFocus() == this) @@ -230,7 +230,7 @@ void QWaylandView::waylandSurfaceChanged(QWaylandSurface *newSurface, QWaylandSu { Q_D(QWaylandView); if (d->output) - d->output->handle()->updateSurfaceForView(this, newSurface, oldSurface); + QWaylandOutputPrivate::get(d->output)->updateSurfaceForView(this, newSurface, oldSurface); } void QWaylandView::waylandSurfaceDestroyed() @@ -240,10 +240,10 @@ void QWaylandView::waylandSurfaceDestroyed() void QWaylandView::waylandOutputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput) { if (oldOutput) - oldOutput->handle()->removeView(this); + QWaylandOutputPrivate::get(oldOutput)->removeView(this); if (newOutput) - newOutput->handle()->addView(this); + QWaylandOutputPrivate::get(newOutput)->addView(this); } QT_END_NAMESPACE -- cgit v1.2.3