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/compositor_api/qwaylandcompositor.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp') diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index d358b1d86..d86b48d8a 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -46,9 +46,10 @@ #include "qwaylandpointer.h" #include "qwaylandtouch.h" +#include "qwaylandsurface_p.h" + #include "wayland_wrapper/qwlcompositor_p.h" #include "wayland_wrapper/qwldatadevice_p.h" -#include "wayland_wrapper/qwlsurface_p.h" #include "wayland_wrapper/qwlinputdevice_p.h" #include "extensions/qwlinputpanel_p.h" @@ -123,6 +124,11 @@ uint32_t QWaylandCompositor::nextSerial() return wl_display_next_serial(waylandDisplay()); } +QListQWaylandCompositor::clients() const +{ + return m_compositor->clients(); +} + void QWaylandCompositor::destroyClientForSurface(QWaylandSurface *surface) { destroyClient(surface->client()); @@ -263,7 +269,7 @@ bool QWaylandCompositor::isDragging() const void QWaylandCompositor::sendDragMoveEvent(const QPoint &global, const QPoint &local, QWaylandSurface *surface) { - m_compositor->sendDragMoveEvent(global, local, surface ? surface->handle() : 0); + m_compositor->sendDragMoveEvent(global, local, surface); } void QWaylandCompositor::sendDragEndEvent() -- cgit v1.2.3