Compositor API: Remove mouseFocus method from QWaylandTouch

It's redundant API because it's already possible to get it through both
QWaylandInputDevice and QWaylandPointer.

Change-Id: Id5522909f1c12ef3e8f0301f7e94cdc77aa68e10
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>

2 files changed, 2 insertions, 15 deletions

diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index a9b44527e..481c29e7b 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -80,12 +80,12 @@ void QWaylandTouchPrivate::touch_release(Resource *resource)
 void QWaylandTouchPrivate::sendDown(uint32_t time, int touch_id, const QPointF &position)
 {
     Q_Q(QWaylandTouch);
-    if (!focusResource || !q->mouseFocus())
+    if (!focusResource || !seat->mouseFocus())
         return;
 
     uint32_t serial = q->compositor()->nextSerial();
 
-    wl_touch_send_down(focusResource->handle, serial, time, q->mouseFocus()->surfaceResource(), touch_id,
+    wl_touch_send_down(focusResource->handle, serial, time, seat->mouseFocus()->surfaceResource(), touch_id,
                        wl_fixed_from_double(position.x()), wl_fixed_from_double(position.y()));
 }
 
@@ -147,9 +147,6 @@ QWaylandCompositor *QWaylandTouch::compositor() const
 /*!
  * Sends a touch point event for the touch device with the given \a id,
  * \a position, and \a state.
- *
- *
- * \sa mouseFocus()
  */
 void QWaylandTouch::sendTouchPointEvent(int id, const QPointF &position, Qt::TouchPointState state)
 {
@@ -246,15 +243,6 @@ struct wl_resource *QWaylandTouch::focusResource() const
 }
 
 /*!
- * Returns the view currently holding mouse focus in the input device.
- */
-QWaylandView *QWaylandTouch::mouseFocus() const
-{
-    Q_D(const QWaylandTouch);
-    return d->seat->mouseFocus();
-}
-
-/*!
  * \internal
  */
 void QWaylandTouch::focusDestroyed(void *data)
diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h
index b6c40ea96..670e892f4 100644
--- a/src/compositor/compositor_api/qwaylandtouch.h
+++ b/src/compositor/compositor_api/qwaylandtouch.h
@@ -72,7 +72,6 @@ public:
 
     wl_resource *focusResource() const;
 
-    QWaylandView *mouseFocus() const;
 private:
     void focusDestroyed(void *data);
     void mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus);