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/wayland_wrapper/qwldatadevicemanager.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/wayland_wrapper/qwldatadevicemanager.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwldatadevicemanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp index 35bbf59f4..affc17d72 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp @@ -41,7 +41,6 @@ #include "qwlinputdevice_p.h" #include "qwlcompositor_p.h" #include "qwldataoffer_p.h" -#include "qwlsurface_p.h" #include "qwaylandmimehelper.h" #include <QtCompositor/private/qwaylandsurface_p.h> @@ -204,7 +203,7 @@ void DataDeviceManager::overrideSelection(const QMimeData &mimeData) QWaylandSurface *focusSurface = QWaylandInputDevicePrivate::get(dev)->keyboardFocus(); if (focusSurface) offerFromCompositorToClient( - QWaylandInputDevicePrivate::get(dev)->dataDevice()->resourceMap().value(QWaylandSurfacePrivate::get(focusSurface)->resource()->client())->handle); + QWaylandInputDevicePrivate::get(dev)->dataDevice()->resourceMap().value(focusSurface->waylandClient())->handle); } bool DataDeviceManager::offerFromCompositorToClient(wl_resource *clientDataDeviceResource) |