Rename QWaylandPointer::currentView to mouseFocus

Change-Id: Ia6c5d96186c8877a51df8541c95b5ccad04a3eb0

5 files changed, 7 insertions, 7 deletions

diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp
index 6262f9b92..1f914552b 100644
--- a/src/compositor/compositor_api/qwaylandpointer.cpp
+++ b/src/compositor/compositor_api/qwaylandpointer.cpp
@@ -161,10 +161,10 @@ void QWaylandPointer::sendMouseWheelEvent(Qt::Orientation orientation, int delta
     d->sendMouseWheelEvent(orientation, delta);
 }
 
-QWaylandSurfaceView *QWaylandPointer::currentView() const
+QWaylandSurfaceView *QWaylandPointer::mouseFocus() const
 {
     Q_D(const QWaylandPointer);
-    return d->focusView();
+    return d->mouseFocus();
 }
 
 QPointF QWaylandPointer::currentLocalPosition() const
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index 6cfe9a5f9..08fd7f3c7 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -104,7 +104,7 @@ public:
     virtual void sendMouseMoveEvent(QWaylandSurfaceView *view, const QPointF &localPos, const QPointF &outputSpacePos);
     virtual void sendMouseWheelEvent(Qt::Orientation orientation, int delta);
 
-    QWaylandSurfaceView *currentView() const;
+    QWaylandSurfaceView *mouseFocus() const;
     QPointF currentLocalPosition() const;
     QPointF currentSpacePosition() const;
 
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp
index fd5c6d3ca..d783223de 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp
@@ -132,7 +132,7 @@ void DataDevice::sourceDestroyed(DataSource *source)
 
 void DataDevice::focus()
 {
-    QWaylandSurfaceView *focus = pointer->currentView();
+    QWaylandSurfaceView *focus = pointer->mouseFocus();
     if (focus != m_dragFocus) {
         setDragFocus(focus, pointer->currentLocalPosition());
     }
@@ -177,7 +177,7 @@ void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource
 {
     if (QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->grabSerial() == serial) {
         if (!QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->isButtonPressed() ||
-             QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->currentView()->surface()->handle() != Surface::fromResource(origin))
+             m_inputDevice->mouseFocus()->surfaceResource() != origin)
             return;
 
         m_dragClient = resource->client();
diff --git a/src/compositor/wayland_wrapper/qwlpointer.cpp b/src/compositor/wayland_wrapper/qwlpointer.cpp
index a41ae8a3e..d987829e9 100644
--- a/src/compositor/wayland_wrapper/qwlpointer.cpp
+++ b/src/compositor/wayland_wrapper/qwlpointer.cpp
@@ -68,7 +68,7 @@ void QWaylandPointerPrivate::startGrab(QWaylandPointerGrabber *grab)
     m_grab = grab;
     grab->pointer = q;
 
-    if (focusView())
+    if (mouseFocus())
         grab->focus();
 }
 
diff --git a/src/compositor/wayland_wrapper/qwlpointer_p.h b/src/compositor/wayland_wrapper/qwlpointer_p.h
index f79418575..cc0c0341e 100644
--- a/src/compositor/wayland_wrapper/qwlpointer_p.h
+++ b/src/compositor/wayland_wrapper/qwlpointer_p.h
@@ -95,7 +95,7 @@ public:
     void sendMouseWheelEvent(Qt::Orientation orientation, int delta);
 
     Resource *focusResource() const { return m_focusResource; }
-    QWaylandSurfaceView *focusView() const { return m_seat->mouseFocus(); }
+    QWaylandSurfaceView *mouseFocus() const { return m_seat->mouseFocus(); }
 
     bool buttonPressed() const;