From 2fa224efd44445f3e87cb9471fd4b9269d5ffc0d Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Sun, 29 Dec 2013 12:06:58 +0100 Subject: Move the code for seat's keyboard, pointer and touch in different classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows to remove the keyboard, pointer or touch objects when the wl_seat advertizes it is gone. Also fixes multiple keyboard, pointer and touch binding for the same object. Change-Id: I878f494caf7f4ac277b6a4d24037dcecf9ff84e4 Reviewed-by: Jørgen Lind Reviewed-by: Laszlo Agocs --- src/client/qwaylandtouch.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/client/qwaylandtouch.cpp') diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp index db6d4b92d..01a199260 100644 --- a/src/client/qwaylandtouch.cpp +++ b/src/client/qwaylandtouch.cpp @@ -83,11 +83,11 @@ void QWaylandTouchExtension::touch_extension_touch(uint32_t time, } mInputDevice = inputDevices.first(); } - QWaylandWindow *win = mInputDevice->mTouchFocus; + QWaylandWindow *win = mInputDevice->touchFocus(); if (!win) - win = mInputDevice->mPointerFocus; + win = mInputDevice->pointerFocus(); if (!win) - win = mInputDevice->mKeyboardFocus; + win = mInputDevice->keyboardFocus(); if (!win || !win->window()) { qWarning("qt_touch_extension: handle_touch: No pointer focus"); return; -- cgit v1.2.3