diff options
author | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-15 21:39:25 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-08-15 21:44:04 +0200 |
commit | 6a716db7f7db4f2f4dbf2c13452b8419f5a6f25b (patch) | |
tree | 7012a9d723db7a2350dbf38a99ac54a481e55ee5 /src | |
parent | e8c750313170879b2bcdab25d4fd290ea11aabb9 (diff) |
Remove QWaylandResourceCollection.
Dead code, apparently previously related to clipboard.
Change-Id: I7b29a8d1730d7b28365cb293df95c6b71b8fdbc0
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/compositor/global/global.pri | 6 | ||||
-rw-r--r-- | src/compositor/global/qwaylandresourcecollection.cpp | 97 | ||||
-rw-r--r-- | src/compositor/global/qwaylandresourcecollection.h | 73 | ||||
-rw-r--r-- | src/compositor/wayland_wrapper/qwlqtkey.cpp | 2 |
4 files changed, 1 insertions, 177 deletions
diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri index 9cbd62d89..fdb2049cd 100644 --- a/src/compositor/global/global.pri +++ b/src/compositor/global/global.pri @@ -1,9 +1,5 @@ INCLUDEPATH += global/ HEADERS += \ - global/qwaylandexport.h \ - global/qwaylandresourcecollection.h - -SOURCES += \ - global/qwaylandresourcecollection.cpp + global/qwaylandexport.h diff --git a/src/compositor/global/qwaylandresourcecollection.cpp b/src/compositor/global/qwaylandresourcecollection.cpp deleted file mode 100644 index cc20e628f..000000000 --- a/src/compositor/global/qwaylandresourcecollection.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qwaylandresourcecollection.h" - -#include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -namespace QtWayland { - -struct wl_resource *resourceForClient(const struct wl_list *list, struct wl_client *client) -{ - struct wl_resource *resource; - wl_list_for_each(resource, list, link) { - if (resource->client == client) { - return resource; - } - } - return 0; -} - -ResourceCollection::ResourceCollection() -{ - wl_list_init(&client_resources); -} - -ResourceCollection::~ResourceCollection() -{ - -} - -void ResourceCollection::registerResource(struct wl_resource *resource) -{ - wl_list_insert(&client_resources,&resource->link); - struct wl_listener *listener = new struct wl_listener; - listener->notify = ResourceCollection::destroy_listener_notify; - wl_signal_add(&resource->destroy_signal, listener); -} - -struct wl_resource *ResourceCollection::resourceForClient(wl_client *client) const -{ - return QtWayland::resourceForClient(&client_resources, client); -} - -bool ResourceCollection::resourceListIsEmpty() const -{ - return wl_list_empty(const_cast<struct wl_list *>(&client_resources)); -} - -void ResourceCollection::destroy_listener_notify(struct wl_listener *listener, void *data) -{ - struct wl_resource *resource = reinterpret_cast<struct wl_resource *>(data); - wl_list_remove(&resource->link); - delete listener; -} - -} - -QT_END_NAMESPACE diff --git a/src/compositor/global/qwaylandresourcecollection.h b/src/compositor/global/qwaylandresourcecollection.h deleted file mode 100644 index 61df0f1d7..000000000 --- a/src/compositor/global/qwaylandresourcecollection.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WAYLAND_RESOURCE_OBJECT_H -#define WAYLAND_RESOURCE_OBJECT_H - -#include <wayland-server.h> - -#include <QtCompositor/qwaylandexport.h> - -QT_BEGIN_NAMESPACE - -namespace QtWayland { - -struct wl_resource *resourceForClient(const struct wl_list *list, struct wl_client *client); - -class ResourceCollection -{ -public: - ResourceCollection(); - virtual ~ResourceCollection(); - void registerResource(struct wl_resource *resource); - struct wl_resource *resourceForClient(struct wl_client *client) const; - bool resourceListIsEmpty() const; - -protected: - struct wl_list client_resources; -private: - static void destroy_listener_notify(struct wl_listener *listener, void *data); -}; - -} - -QT_END_NAMESPACE - -#endif //WAYLAND_RESOURCE_OBJECT_H diff --git a/src/compositor/wayland_wrapper/qwlqtkey.cpp b/src/compositor/wayland_wrapper/qwlqtkey.cpp index ba0288782..74c21b6a8 100644 --- a/src/compositor/wayland_wrapper/qwlqtkey.cpp +++ b/src/compositor/wayland_wrapper/qwlqtkey.cpp @@ -43,8 +43,6 @@ #include <QKeyEvent> #include <QWindow> -#include "qwaylandresourcecollection.h" - QT_BEGIN_NAMESPACE namespace QtWayland { |