1 files changed, 37 insertions, 30 deletions

diff --git a/tests/auto/client/shared/datadevice.cpp b/tests/auto/client/shared/datadevice.cpp
index dfa18952c..efb88d0b1 100644
--- a/tests/auto/client/shared/datadevice.cpp
+++ b/tests/auto/client/shared/datadevice.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "datadevice.h"
 
@@ -32,7 +7,7 @@ namespace MockCompositor {
 
 bool DataDeviceManager::isClean()
 {
-    for (auto *device : qAsConst(m_dataDevices)) {
+    for (auto *device : std::as_const(m_dataDevices)) {
         // The client should not leak selection offers, i.e. if this fails, there is a missing
         // data_offer.destroy request
         if (!device->m_sentSelectionOffers.empty())
@@ -60,6 +35,11 @@ void DataDeviceManager::data_device_manager_get_data_device(Resource *resource,
     device->add(resource->client(), id, resource->version());
 }
 
+void DataDeviceManager::data_device_manager_create_data_source(Resource *resource, uint32_t id)
+{
+    new QtWaylandServer::wl_data_source(resource->client(), id, 1);
+}
+
 DataDevice::~DataDevice()
 {
     // If the client(s) hasn't deleted the wayland object, just ignore subsequent events
@@ -71,6 +51,7 @@ DataOffer *DataDevice::sendDataOffer(wl_client *client, const QStringList &mimeT
 {
     Q_ASSERT(client);
     auto *offer = new DataOffer(this, client, m_manager->m_version);
+    m_offer = offer;
     for (auto *resource : resourceMap().values(client))
         wl_data_device::send_data_offer(resource->handle, offer->resource()->handle);
     for (const auto &mimeType : mimeTypes)
@@ -86,6 +67,33 @@ void DataDevice::sendSelection(DataOffer *offer)
     m_sentSelectionOffers << offer;
 }
 
+void DataDevice::sendEnter(Surface *surface, const QPoint &position)
+{
+    uint serial = m_manager->m_compositor->nextSerial();
+    Resource *resource = resourceMap().value(surface->resource()->client());
+    if (m_offer)
+        wl_data_device::send_enter(resource->handle, serial, surface->resource()->handle, position.x(), position.y(), m_offer->resource()->handle);
+}
+
+void DataDevice::sendMotion(Surface *surface, const QPoint &position)
+{
+    uint32_t time = m_manager->m_compositor->nextSerial();
+    Resource *resource = resourceMap().value(surface->resource()->client());
+    wl_data_device::send_motion(resource->handle, time, position.x(), position.y());
+}
+
+void DataDevice::sendDrop(Surface *surface)
+{
+    Resource *resource = resourceMap().value(surface->resource()->client());
+    wl_data_device::send_drop(resource->handle);
+}
+
+void DataDevice::sendLeave(Surface *surface)
+{
+    Resource *resource = resourceMap().value(surface->resource()->client());
+    wl_data_device::send_leave(resource->handle);
+}
+
 void DataOffer::data_offer_destroy_resource(Resource *resource)
 {
     Q_UNUSED(resource);
@@ -100,8 +108,7 @@ void DataOffer::data_offer_receive(Resource *resource, const QString &mime_type,
 
 void DataOffer::data_offer_destroy(QtWaylandServer::wl_data_offer::Resource *resource)
 {
-    bool removed = m_dataDevice->m_sentSelectionOffers.removeOne(this);
-    QVERIFY(removed);
+    m_dataDevice->m_sentSelectionOffers.removeOne(this);
     wl_resource_destroy(resource->handle);
 }