From e01b81339a37830c48f2cec0583e5d0aba592601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Tue, 11 Aug 2015 16:07:23 +0200 Subject: Remove QtWayland::Surface Its enough to have QWaylandSurface and QWaylandSurfacePrivate. Also don't pass QWaylandSurfacePrivate around, but pass QWaylandSurface and then use the QWaylandSurfacePrivate::get function. Change-Id: I915cc9d7b4497ad1c6f1f2dee61d9d0db069ba6b --- src/compositor/extensions/qwlqttouch.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/compositor/extensions/qwlqttouch.cpp') diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp index 19f5b3936..9c476dbf7 100644 --- a/src/compositor/extensions/qwlqttouch.cpp +++ b/src/compositor/extensions/qwlqttouch.cpp @@ -35,7 +35,6 @@ ****************************************************************************/ #include "qwlqttouch_p.h" -#include "qwlsurface_p.h" #include "qwaylandview.h" #include #include @@ -73,7 +72,7 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandView *view return false; QPointF surfacePos = view->requestedPosition(); - wl_client *surfaceClient = view->surface()->handle()->resource()->client(); + wl_client *surfaceClient = view->surface()->client()->client(); uint32_t time = m_compositor->currentTimeMsecs(); const int rescount = m_resources.count(); -- cgit v1.2.3