From 3720912f996e8e5081d9cd58af20d992a5eb9dc9 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 29 Jun 2021 21:41:20 +0200 Subject: [PATCH] GIT_SILENT Misc SPDX fixes --- dataengines/geolocation/location_ip.cpp | 10 ++++++---- libtaskmanager/declarative/pipewirecore.cpp | 5 +---- libtaskmanager/declarative/pipewirecore.h | 5 +---- libtaskmanager/declarative/pipewiresourcestream.cpp | 5 +---- libtaskmanager/declarative/pipewiresourcestream.h | 5 +---- runners/kill/killrunner.h | 5 +++-- xembed-sni-proxy/sniproxy.h | 6 +----- 7 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dataengines/geolocation/location_ip.cpp b/dataengines/geolocation/location_ip.cpp index 285879901..27b530810 100644 --- a/dataengines/geolocation/location_ip.cpp +++ b/dataengines/geolocation/location_ip.cpp @@ -1,9 +1,11 @@ /* SPDX-FileCopyrightText: 2009 Petri Damstén - - Original Implementation. - 2009 Andrew Coles - - Extension to iplocationtools engine. - 2015 Martin Gräßlin + + Original Implementation: + SPDX-FileCopyrightText: 2009 Andrew Coles + + Extension to iplocationtools engine: + SPDX-FileCopyrightText: 2015 Martin Gräßlin SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/libtaskmanager/declarative/pipewirecore.cpp b/libtaskmanager/declarative/pipewirecore.cpp index 15a660419..a146718ed 100644 --- a/libtaskmanager/declarative/pipewirecore.cpp +++ b/libtaskmanager/declarative/pipewirecore.cpp @@ -1,11 +1,8 @@ /* SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez + SPDX-FileContributor: Jan Grulich SPDX-License-Identifier: LGPL-2.0-or-later - - Authors: - Jan Grulich - Aleix Pol Gonzalez */ #include "pipewirecore.h" diff --git a/libtaskmanager/declarative/pipewirecore.h b/libtaskmanager/declarative/pipewirecore.h index a0cae3e11..1d9630c0a 100644 --- a/libtaskmanager/declarative/pipewirecore.h +++ b/libtaskmanager/declarative/pipewirecore.h @@ -1,11 +1,8 @@ /* SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez + SPDX-FileContributor: Jan Grulich SPDX-License-Identifier: LGPL-2.0-or-later - - Authors: - Jan Grulich - Aleix Pol Gonzalez */ #pragma once diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp index c2233bddc..bc1692df3 100644 --- a/libtaskmanager/declarative/pipewiresourcestream.cpp +++ b/libtaskmanager/declarative/pipewiresourcestream.cpp @@ -1,12 +1,9 @@ /* SPDX-FileCopyrightText: 2018-2020 Red Hat Inc SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez + SPDX-FileContributor: Jan Grulich SPDX-License-Identifier: LGPL-2.0-or-later - - Authors: - Jan Grulich - Aleix Pol Gonzalez */ #include "pipewiresourcestream.h" diff --git a/libtaskmanager/declarative/pipewiresourcestream.h b/libtaskmanager/declarative/pipewiresourcestream.h index f2ef7568e..91e0c8eb6 100644 --- a/libtaskmanager/declarative/pipewiresourcestream.h +++ b/libtaskmanager/declarative/pipewiresourcestream.h @@ -1,12 +1,9 @@ /* SPDX-FileCopyrightText: 2018-2020 Red Hat Inc SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez + SPDX-FileContributor: Jan Grulich SPDX-License-Identifier: LGPL-2.0-or-later - - Authors: - Jan Grulich - Aleix Pol Gonzalez */ #pragma once diff --git a/runners/kill/killrunner.h b/runners/kill/killrunner.h index ab65daf05..c05354d87 100644 --- a/runners/kill/killrunner.h +++ b/runners/kill/killrunner.h @@ -1,5 +1,6 @@ -/* Copyright 2009 - Copyright 2020 +/* + SPDX-FileCopyrightText: 2009 Jan Gerrit Marker + SPDX-FileCopyrightText: 2020 Alexander Lohnau SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ diff --git a/xembed-sni-proxy/sniproxy.h b/xembed-sni-proxy/sniproxy.h index 6ff115005..c888a2911 100644 --- a/xembed-sni-proxy/sniproxy.h +++ b/xembed-sni-proxy/sniproxy.h @@ -30,7 +30,6 @@ class SNIProxy : public QObject Q_PROPERTY(int WindowId READ WindowId) Q_PROPERTY(bool ItemIsMenu READ ItemIsMenu) Q_PROPERTY(KDbusImageVector IconPixmap READ IconPixmap) - Q_PROPERTY(QDBusObjectPath Menu READ menu CONSTANT) public: explicit SNIProxy(xcb_window_t wid, QObject *parent = nullptr); @@ -39,10 +38,7 @@ public: void update(); void resizeWindow(const uint16_t width, const uint16_t height) const; void hideContainerWindow(xcb_window_t windowId) const; - QDBusObjectPath menu() const - { - return QDBusObjectPath("/"); - } + /** * @return the category of the application associated to this item * @see Category