diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:21:17 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
| commit | 0f3c1a1669aa133efd8701f25b8b8093517b81a7 (patch) | |
| tree | 964e3be6ecd36c0c4eeafbab0f65e74eac9ee80b /src/compositor/wayland_wrapper/qwldatadevice.cpp | |
| parent | d1359f8b0c2b8fcffc2112d2e29d530ac1ab7c9a (diff) | |
Rename QWaylandSurfaceView to QWaylandView
and rename QWaylandSurfaceItem to QWaylandQuickView
Change-Id: I989b482eb79df06e9f265bc2b0ef6b3dce7509d6
Diffstat (limited to 'src/compositor/wayland_wrapper/qwldatadevice.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwldatadevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index d783223de..0b3fee393 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -47,7 +47,7 @@ #include "qwldatadevicemanager_p.h" #include "qwaylanddrag.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCompositor/QWaylandClient> #include <QDebug> @@ -85,7 +85,7 @@ void DataDevice::setFocus(QWaylandClient *focusClient) } } -void DataDevice::setDragFocus(QWaylandSurfaceView *focus, const QPointF &localPosition) +void DataDevice::setDragFocus(QWaylandView *focus, const QPointF &localPosition) { if (m_dragFocusResource) { send_leave(m_dragFocusResource->handle); @@ -119,7 +119,7 @@ void DataDevice::setDragFocus(QWaylandSurfaceView *focus, const QPointF &localPo m_dragFocusResource = resource; } -QWaylandSurfaceView *DataDevice::dragIcon() const +QWaylandView *DataDevice::dragIcon() const { return m_dragIcon; } @@ -132,7 +132,7 @@ void DataDevice::sourceDestroyed(DataSource *source) void DataDevice::focus() { - QWaylandSurfaceView *focus = pointer->mouseFocus(); + QWaylandView *focus = pointer->mouseFocus(); if (focus != m_dragFocus) { setDragFocus(focus, pointer->currentLocalPosition()); } |