diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-11 16:07:23 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | e01b81339a37830c48f2cec0583e5d0aba592601 (patch) | |
| tree | bd3085460c0139a10c5fd5d322b9059e6c97b5ee /src/compositor/extensions/qwlqtkey.cpp | |
| parent | bc331abe8e8ffaa3db12be7ae69e7b658dd700ac (diff) | |
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
Diffstat (limited to 'src/compositor/extensions/qwlqtkey.cpp')
| -rw-r--r-- | src/compositor/extensions/qwlqtkey.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp index cc6bb7afd..875524bf5 100644 --- a/src/compositor/extensions/qwlqtkey.cpp +++ b/src/compositor/extensions/qwlqtkey.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qwlqtkey_p.h" -#include "qwlsurface_p.h" +#include <QtCompositor/QWaylandSurface> #include <QKeyEvent> #include <QWindow> @@ -50,15 +50,15 @@ QtKeyExtensionGlobal::QtKeyExtensionGlobal(Compositor *compositor) { } -bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, Surface *surface) +bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, QWaylandSurface *surface) { uint32_t time = m_compositor->currentTimeMsecs(); - Resource *target = surface ? resourceMap().value(surface->resource()->client()) : 0; + Resource *target = surface ? resourceMap().value(surface->waylandClient()) : 0; if (target) { send_qtkey(target->handle, - surface ? surface->resource()->handle : 0, + surface ? surface->resource() : 0, time, event->type(), event->key(), event->modifiers(), event->nativeScanCode(), event->nativeVirtualKey(), |