SPDX fixes based on review

2026-11-03 14:49:44 -09:00 · 2021-06-15 11:50:29 +02:00 · 2021-06-15 11:50:29 +02:00 · 390d53cd66
commit 390d53cd66
parent 246b1004a7
80 changed files with 101 additions and 114 deletions
--- a/applets/kickoff/package/contents/ui/FullRepresentation.qml
+++ b/applets/kickoff/package/contents/ui/FullRepresentation.qml
@ -2,7 +2,7 @@
    SPDX-FileCopyrightText: 2011 Martin Gräßlin <mgraesslin@kde.org>
    SPDX-FileCopyrightText: 2012 Gregor Taetzner <gregor@freenet.de>
    SPDX-FileCopyrightText: 2012 Marco Martin <mart@kde.org>
-    Copyright (C) 2013 2014 David Edmundson <davidedmundson@kde.org>
+    SPDX-FileCopyrightText: 2013 2014 David Edmundson <davidedmundson@kde.org>
    SPDX-FileCopyrightText: 2014 Sebastian Kügler <sebas@kde.org>
    SPDX-FileCopyrightText: 2021 Mikel Johnson <mikel5764@gmail.com>

--- a/applets/kickoff/package/contents/ui/Header.qml
+++ b/applets/kickoff/package/contents/ui/Header.qml
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2014 Sebastian Kügler <sebas@kde.org>
-    SPDX-FileCopyrightText: SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+    SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
    SPDX-FileCopyrightText: 2021 Mikel Johnson <mikel5764@gmail.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/applets/kimpanel/backend/ibus/ibus15/gdkkeynames_p.c
+++ b/applets/kimpanel/backend/ibus/ibus15/gdkkeynames_p.c
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald

--- a/applets/kimpanel/backend/ibus/ibus15/gdkkeynames_p.h
+++ b/applets/kimpanel/backend/ibus/ibus15/gdkkeynames_p.h
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald
    SPDX-FileCopyrightText: 2005, 2006, 2007, 2009 GNOME Foundation
--- a/applets/kimpanel/backend/ibus/ibus15/gdkkeysyms_p.h
+++ b/applets/kimpanel/backend/ibus/ibus15/gdkkeysyms_p.h
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald
    SPDX-FileCopyrightText: 2005, 2006, 2007, 2009 GNOME Foundation
--- a/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.c
+++ b/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.c
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald
    SPDX-FileCopyrightText: 2005, 2006, 2007, 2009 GNOME Foundation
--- a/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
+++ b/applets/kimpanel/backend/ibus/ibus15/gtkaccelparse_p.h
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald
    SPDX-FileCopyrightText: 2005, 2006, 2007, 2009 GNOME Foundation
--- a/applets/kimpanel/backend/ibus/ibus15/keyname-table.h
+++ b/applets/kimpanel/backend/ibus/ibus15/keyname-table.h
@ -1,6 +1,6 @@
 /*
    GDK - The GIMP Drawing Kit
-    SPDX-FileCopyrightText: 1995-1997 Peter
+    SPDX-FileCopyrightText: 1995-1997 Peter Mattis
    SPDX-FileCopyrightText: 1995-1997 Spencer Kimball
    SPDX-FileCopyrightText: 1995-1997 Josh MacDonald
    SPDX-FileCopyrightText: 2005, 2006, 2007, 2009 GNOME Foundation
@ -4026,4 +4026,4 @@ NC_("keyboard label", "XF86WakeUp")
 NC_("keyboard label", "XF86Suspend")

 #endif
-// clang-format on
+// clang-format on
--- a/applets/taskmanager/plugin/taskmanagerplugin.cpp
+++ b/applets/taskmanager/plugin/taskmanagerplugin.cpp
@ -1,11 +1,6 @@
-/*
-    SPDX-FileCopyrightText: 2013 Eike Hein <hein@kde.org>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-
 /*
    SPDX-FileCopyrightText: 2011 Martin Gräßlin <mgraesslin@kde.org>
+    SPDX-FileCopyrightText: 2013 Eike Hein <hein@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/cmake/modules/FindXdgUserDir.cmake
+++ b/cmake/modules/FindXdgUserDir.cmake
@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# SPDX-FileCopyrightText: 2021 Méven Car meven.car @enioka.com
+# SPDX-FileCopyrightText: 2021 Méven Car meven.car@enioka.com

 find_program(XdgUserDir_EXEC xdg-user-dir)

--- a/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
+++ b/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/autotests/foldermodeltest.h
+++ b/containments/desktop/plugins/folder/autotests/foldermodeltest.h
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/autotests/screenmappertest.cpp
+++ b/containments/desktop/plugins/folder/autotests/screenmappertest.cpp
@ -1,7 +1,8 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+
    Work sponsored by the LiMux project of the city of Munich.
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/autotests/screenmappertest.h
+++ b/containments/desktop/plugins/folder/autotests/screenmappertest.h
@ -1,7 +1,8 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+
    Work sponsored by the LiMux project of the city of Munich.
+    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp
+++ b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    Author: Laurent Montel <laurent.montel@kdab.com>
+    SPDX-FileContributor: 2017 Laurent Montel <laurent.montel@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h
+++ b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    Author: Laurent Montel <laurent.montel@kdab.com>
+    SPDX-FileContributor: 2017 Laurent Montel <laurent.montel@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/folderplugin_private_export.h
+++ b/containments/desktop/plugins/folder/folderplugin_private_export.h
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/screenmapper.cpp
+++ b/containments/desktop/plugins/folder/screenmapper.cpp
@ -1,7 +1,9 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+
    Work sponsored by the LiMux project of the city of Munich.
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>
+
    SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "screenmapper.h"
--- a/containments/desktop/plugins/folder/screenmapper.h
+++ b/containments/desktop/plugins/folder/screenmapper.h
@ -1,7 +1,8 @@
 /*
    SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
-    SPDX-FileCopyrightText: Andras Mantia <andras.mantia@kdab.com>
+
    Work sponsored by the LiMux project of the city of Munich.
+    SPDX-FileContributor: Andras Mantia <andras.mantia@kdab.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/containments/desktop/plugins/folder/shortcut.cpp
+++ b/containments/desktop/plugins/folder/shortcut.cpp
@ -1,5 +1,5 @@
 /*
-    Copyright Ken <https://stackoverflow.com/users/1568857/ken>
+    SPDX-FileCopyrightText: Ken <https://stackoverflow.com/users/1568857/ken>
    SPDX-FileCopyrightText: 2016 Leslie Zhai <xiangzhai83@gmail.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/containments/desktop/plugins/folder/shortcut.h
+++ b/containments/desktop/plugins/folder/shortcut.h
@ -1,5 +1,5 @@
 /*
-    Copyright Ken <https://stackoverflow.com/users/1568857/ken>
+    SPDX-FileCopyrightText: Ken <https://stackoverflow.com/users/1568857/ken>
    SPDX-FileCopyrightText: 2016 Leslie Zhai <xiangzhai83@gmail.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/imports/activitymanager/switcherbackend.cpp
+++ b/imports/activitymanager/switcherbackend.cpp
@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014. 2015 Ivan Cukic <ivan.cukic(at)kde.org>
+    SPDX-FileCopyrightText: 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org>
    SPDX-FileCopyrightText: 2009 Martin Gräßlin <mgraesslin@kde.org>
    SPDX-FileCopyrightText: 2003 Lubos Lunak <l.lunak@kde.org>
    SPDX-FileCopyrightText: 1999, 2000 Matthias Ettrich <ettrich@kde.org>
--- a/kcms/desktoppaths/globalpaths.h
+++ b/kcms/desktoppaths/globalpaths.h
@ -2,7 +2,7 @@
    "Desktop Icons Options" Tab for KDesktop configuration

    SPDX-FileCopyrightText: 1996 Martin R. Jones
-    SPDX-FileCopyrightText: 1998-2007 David Faure <faure@kde.org>
+    SPDX-FileCopyrightText: 1998, 2007 David Faure <faure@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/kded/kcmkded.cpp
+++ b/kcms/kded/kcmkded.cpp
@ -1,6 +1,5 @@
 // vim: noexpandtab shiftwidth=4 tabstop=4
 /*
-    This file is part of the KDE project
   SPDX-FileCopyrightText: 2002 Daniel Molkentin <molkentin@kde.org>
   SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>

@ -51,7 +50,7 @@ KDEDConfig::KDEDConfig(QObject *parent, const QVariantList &args)
                                       QStringLiteral("2.0"),
                                       QString(),
                                       KAboutLicense::GPL,
-                                       i18n("(c) 2002 Daniel Molkentin, SPDX-FileCopyrightText: 2020 Kai Uwe Broulik "));
+                                       i18n("(c) 2002 Daniel Molkentin, (c) 2020 Kai Uwe Broulik"));
    about->addAuthor(i18n("Daniel Molkentin"), QString(), QStringLiteral("molkentin@kde.org"));
    about->addAuthor(i18n("Kai Uwe Broulik"), QString(), QStringLiteral("kde@broulik.de"));
    setAboutData(about);
--- a/kcms/keyboard/bindings.cpp
+++ b/kcms/keyboard/bindings.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/bindings.h
+++ b/kcms/keyboard/bindings.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/flags.cpp
+++ b/kcms/keyboard/flags.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/flags.h
+++ b/kcms/keyboard/flags.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/iso_codes.cpp
+++ b/kcms/keyboard/iso_codes.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/iso_codes.h
+++ b/kcms/keyboard/iso_codes.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_add_layout_dialog.cpp
+++ b/kcms/keyboard/kcm_add_layout_dialog.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_add_layout_dialog.h
+++ b/kcms/keyboard/kcm_add_layout_dialog.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_keyboard.cpp
+++ b/kcms/keyboard/kcm_keyboard.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_keyboard.h
+++ b/kcms/keyboard/kcm_keyboard.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_keyboard_widget.cpp
+++ b/kcms/keyboard/kcm_keyboard_widget.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_keyboard_widget.h
+++ b/kcms/keyboard/kcm_keyboard_widget.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_view_models.cpp
+++ b/kcms/keyboard/kcm_view_models.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcm_view_models.h
+++ b/kcms/keyboard/kcm_view_models.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/kcmmisc.cpp
+++ b/kcms/keyboard/kcmmisc.cpp
@ -1,14 +1,11 @@
 /*
    kcmmisc.cpp

-    SPDX-FileCopyrightText: 1997 Patrick Dowler dowler @morgul.fsh.uvic.ca
+    SPDX-FileCopyrightText: 1997 Patrick Dowler <dowler@morgul.fsh.uvic.ca>

    Layout management, cleanups:
    SPDX-FileCopyrightText: 1999 Dirk A. Mueller <dmuell@gmx.net>

-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
    SPDX-License-Identifier: GPL-2.0-or-later
 */

--- a/kcms/keyboard/kcmmisc.h
+++ b/kcms/keyboard/kcmmisc.h
@ -1,10 +1,5 @@
 /*
-    keyboard.h
-
-    SPDX-FileCopyrightText: 1997 Patrick Dowler dowler @morgul.fsh.uvic.ca
-
-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
+    SPDX-FileCopyrightText: 1997 Patrick Dowler <dowler@morgul.fsh.uvic.ca>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_config.cpp
+++ b/kcms/keyboard/keyboard_config.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_config.h
+++ b/kcms/keyboard/keyboard_config.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_daemon.cpp
+++ b/kcms/keyboard/keyboard_daemon.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_daemon.h
+++ b/kcms/keyboard/keyboard_daemon.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_dbus.h
+++ b/kcms/keyboard/keyboard_dbus.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_hardware.cpp
+++ b/kcms/keyboard/keyboard_hardware.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/keyboard_hardware.h
+++ b/kcms/keyboard/keyboard_hardware.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/layout_memory.cpp
+++ b/kcms/keyboard/layout_memory.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/layout_memory.h
+++ b/kcms/keyboard/layout_memory.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/layout_memory_persister.cpp
+++ b/kcms/keyboard/layout_memory_persister.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/layout_memory_persister.h
+++ b/kcms/keyboard/layout_memory_persister.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/tests/flags_test.cpp
+++ b/kcms/keyboard/tests/flags_test.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/tests/iso_codes_test.cpp
+++ b/kcms/keyboard/tests/iso_codes_test.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/tests/keyboard_daemon_test.cpp
+++ b/kcms/keyboard/tests/keyboard_daemon_test.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/tests/layout_memory_persister_test.cpp
+++ b/kcms/keyboard/tests/layout_memory_persister_test.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/tests/xkb_rules_test.cpp
+++ b/kcms/keyboard/tests/xkb_rules_test.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2011 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2011 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/udev_helper.cpp
+++ b/kcms/keyboard/udev_helper.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2015 David Rosca (nowrep@gmail.com)
+    SPDX-FileCopyrightText: 2015 David Rosca <nowrep@gmail.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/udev_helper.h
+++ b/kcms/keyboard/udev_helper.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2015 David Rosca (nowrep@gmail.com)
+    SPDX-FileCopyrightText: 2015 David Rosca <nowrep@gmail.com>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/x11_helper.cpp
+++ b/kcms/keyboard/x11_helper.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/x11_helper.h
+++ b/kcms/keyboard/x11_helper.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xinput_helper.cpp
+++ b/kcms/keyboard/xinput_helper.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xinput_helper.h
+++ b/kcms/keyboard/xinput_helper.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xkb_helper.cpp
+++ b/kcms/keyboard/xkb_helper.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xkb_helper.h
+++ b/kcms/keyboard/xkb_helper.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xkb_rules.cpp
+++ b/kcms/keyboard/xkb_rules.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/keyboard/xkb_rules.h
+++ b/kcms/keyboard/xkb_rules.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 2010 Andriy Rysin (rysin@kde.org)
+    SPDX-FileCopyrightText: 2010 Andriy Rysin <rysin@kde.org>

    SPDX-License-Identifier: GPL-2.0-or-later
 */
--- a/kcms/landingpage/landingpage.cpp
+++ b/kcms/landingpage/landingpage.cpp
@ -1,6 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2021 Marco Martin <mart@kde.org>
-    Copyright (C) 2018 <furkantokac34@gmail.com>
+    SPDX-FileCopyrightText: 2018 <furkantokac34@gmail.com>
    SPDX-FileCopyrightText: 2019 Cyril Rossi <cyril.rossi@enioka.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/kcms/landingpage/landingpage.h
+++ b/kcms/landingpage/landingpage.h
@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 <furkantokac34@gmail.com>
+    SPDX-FileCopyrightText: 2018 <furkantokac34@gmail.com>
    SPDX-FileCopyrightText: 2019 Cyril Rossi <cyril.rossi@enioka.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/kcms/mouse/kapplymousetheme.cpp
+++ b/kcms/mouse/kapplymousetheme.cpp
@ -1,16 +1,12 @@
 /*
-    main.cpp
-
    SPDX-FileCopyrightText: 1999 Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
    SPDX-FileCopyrightText: 2005 Lubos Lunak <l.lunak@kde.org>
    SPDX-FileCopyrightText: 2017 Xuetian Weng <wengxt@gmail.com>
    SPDX-FileCopyrightText: 2018 Roman Gilg <subdiff@gmail.com>

-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
    SPDX-License-Identifier: GPL-2.0-or-later
 */
+
 #include "backends/x11/x11_backend.h"

 #include <KWindowSystem/kwindowsystem.h>
--- a/kcms/mouse/kcm/xlib/xlib_config.cpp
+++ b/kcms/mouse/kcm/xlib/xlib_config.cpp
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 1997 Patrick Dowler dowler @morgul.fsh.uvic.ca
+    SPDX-FileCopyrightText: 1997 Patrick Dowler <dowler@morgul.fsh.uvic.ca>
    SPDX-FileCopyrightText: 1999 Dirk A. Mueller <dmuell@gmx.net>
    SPDX-FileCopyrightText: 1999 Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
    SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org>
--- a/kcms/mouse/kcm/xlib/xlib_config.h
+++ b/kcms/mouse/kcm/xlib/xlib_config.h
@ -1,5 +1,5 @@
 /*
-    SPDX-FileCopyrightText: 1997 Patrick Dowler dowler @morgul.fsh.uvic.ca
+    SPDX-FileCopyrightText: 1997 Patrick Dowler <dowler@morgul.fsh.uvic.ca>
    SPDX-FileCopyrightText: 1999 Dirk A. Mueller <dmuell@gmx.net>
    SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org>
    SPDX-FileCopyrightText: 2018 Roman Gilg <subdiff@gmail.com>
--- a/kcms/spellchecking/spellchecking.cpp
+++ b/kcms/spellchecking/spellchecking.cpp
@ -1,10 +1,8 @@
 /*
+    SPDX-FileCopyrightText: 2008 Albert Astals Cid <aacid@kde.org>
+    SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>

-SPDX-FileCopyrightText: 2008 Albert Astals Cid <aacid@kde.org>
-SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */

 #include "spellchecking.h"
--- a/kcms/spellchecking/spellchecking.h
+++ b/kcms/spellchecking/spellchecking.h
@ -1,10 +1,8 @@
 /*
+    SPDX-FileCopyrightText: 2008 Albert Astals Cid <aacid@kde.org>
+    SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>

-SPDX-FileCopyrightText: 2008 Albert Astals Cid <aacid@kde.org>
-SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */

 #ifndef SONNETSPELLCHECKINGMODULE_H
--- a/kcms/spellchecking/spellcheckingskeleton.cpp
+++ b/kcms/spellchecking/spellcheckingskeleton.cpp
@ -1,9 +1,7 @@
 /*
+    SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>

-SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */

 #include "spellcheckingskeleton.h"
--- a/kcms/spellchecking/spellcheckingskeleton.h
+++ b/kcms/spellchecking/spellcheckingskeleton.h
@ -1,9 +1,7 @@
 /*
+    SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>

-SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */

 #ifndef SPELLCHECKINGSKELETON_H
--- a/kcms/touchpad/README.md
+++ b/kcms/touchpad/README.md
@ -0,0 +1,10 @@
+Touchpad KCM
+============
+
+* KCModule (Wayland + X)
+* Daemon (X only)
+  - Automatically enable/disable touchpad when typing and/or when mouse is plugged in
+  - Enable/disable touchpad with keyboard shortcuts
+* Applet (X only)
+  - Shows touchpad's state
+  - Toggle touchpad with single click
--- a/kcms/touchpad/backends/x11/synapticstouchpad.cpp
+++ b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
@ -1,5 +1,6 @@
 /*
    SPDX-FileCopyrightText: 2013 Alexander Mezin <mezin.alexander@gmail.com>
+    SPDX-FileContributor: Peter Osterlund (petero2@telia.com)

    SPDX-License-Identifier: GPL-2.0-or-later
 */
@ -29,9 +30,6 @@
 * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors:
- *      Peter Osterlund (petero2@telia.com)
 */

 #include <QDebug>
--- a/kcms/workspaceoptions/workspaceoptions.cpp
+++ b/kcms/workspaceoptions/workspaceoptions.cpp
@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 <furkantokac34@gmail.com>
+    SPDX-FileCopyrightText: 2018 <furkantokac34@gmail.com>
    SPDX-FileCopyrightText: 2019 Cyril Rossi <cyril.rossi@enioka.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/kcms/workspaceoptions/workspaceoptions.h
+++ b/kcms/workspaceoptions/workspaceoptions.h
@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 <furkantokac34@gmail.com>
+    SPDX-FileCopyrightText: 2018 <furkantokac34@gmail.com>
    SPDX-FileCopyrightText: 2019 Cyril Rossi <cyril.rossi@enioka.com>

    SPDX-License-Identifier: GPL-2.0-or-later
--- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
+++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
@ -37,7 +37,7 @@ DeviceAutomounterKCM::DeviceAutomounterKCM(QWidget *parent, const QVariantList &
                                       QStringLiteral("2.0"),
                                       QString(),
                                       KAboutLicense::GPL_V2,
-                                       i18n("(c) 2009 Trever Fischer, SPDX-FileCopyrightText: 2015 Kai Uwe Broulik "));
+                                       i18n("(c) 2009 Trever Fischer, (c) 2015 Kai Uwe Broulik"));
    about->addAuthor(i18n("Trever Fischer"), i18n("Original Author"));
    about->addAuthor(i18n("Kai Uwe Broulik"), i18n("Plasma 5 Port"), QStringLiteral("kde@privat.broulik.de"));