[plasma/plasma-workspace] /: Manual SPDX fixes & cleanup

Alexander Lohnau null at kde.org
Sat Aug 14 06:16:38 BST 2021


Git commit fefe12dff6b1b2c700ae4c9efddbe188a6e050a9 by Alexander Lohnau.
Committed on 14/08/2021 at 05:16.
Pushed by alex into branch 'master'.

Manual SPDX fixes & cleanup

M  +0    -8    applets/panelspacer/package/contents/ui/main.qml
M  +4    -6    applets/systemtray/package/contents/ui/ConfigGeneral.qml
M  +0    -1    applets/systemtray/statusnotifieritemhost.h
M  +0    -1    applets/systemtray/statusnotifieritemsource.cpp
M  +0    -1    applets/systemtray/statusnotifieritemsource.h
M  +0    -1    applets/systemtray/systemtraytypes.cpp
M  +0    -1    applets/systemtray/systemtraytypes.h
M  +1    -1    dataengines/powermanagement/powermanagementengine.cpp
M  +0    -1    dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
M  +0    -1    dataengines/statusnotifieritem/statusnotifieritem_engine.h
M  +0    -1    dataengines/statusnotifieritem/statusnotifieritemsource.cpp
M  +0    -1    dataengines/statusnotifieritem/statusnotifieritemsource.h
M  +0    -1    dataengines/statusnotifieritem/systemtraytypes.cpp
M  +0    -1    dataengines/statusnotifieritem/systemtraytypes.h
M  +0    -10   dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
M  +0    -10   dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
M  +0    -10   dataengines/weather/ions/envcan/ion_envcan.cpp
M  +0    -10   dataengines/weather/ions/envcan/ion_envcan.h
M  +0    -10   dataengines/weather/ions/noaa/ion_noaa.cpp
M  +0    -10   dataengines/weather/ions/noaa/ion_noaa.h
M  +0    -10   dataengines/weather/ions/wetter.com/ion_wettercom.cpp
M  +0    -10   dataengines/weather/ions/wetter.com/ion_wettercom.h
M  +0    -10   dataengines/weather/weatherengine.cpp
M  +0    -10   dataengines/weather/weatherengine.h
M  +2    -2    doc/PolicyKit-kde/index.docbook
M  +2    -12   kcms/autostart/autostart.cpp
M  +1    -12   kcms/autostart/autostart.h
M  +1    -10   kcms/autostart/autostartmodel.cpp
M  +1    -10   kcms/autostart/autostartmodel.h
M  +0    -10   kcms/autostart/package/contents/ui/main.qml
M  +0    -10   kcms/colors/editor/kcolorschemeeditor.cpp
M  +1    -11   kcms/colors/editor/previewwidget.cpp
M  +0    -10   kcms/colors/editor/previewwidget.h
M  +0    -10   kcms/colors/editor/scmeditorcolors.cpp
M  +0    -10   kcms/colors/editor/scmeditorcolors.h
M  +0    -10   kcms/colors/editor/scmeditordialog.cpp
M  +0    -10   kcms/colors/editor/scmeditordialog.h
M  +0    -10   kcms/colors/editor/scmeditoreffects.cpp
M  +0    -10   kcms/colors/editor/scmeditoreffects.h
M  +0    -10   kcms/colors/editor/scmeditoroptions.cpp
M  +0    -10   kcms/colors/editor/scmeditoroptions.h
M  +1    -11   kcms/colors/editor/setpreviewwidget.cpp
M  +0    -10   kcms/colors/editor/setpreviewwidget.h
M  +0    -8    kcms/formats/kcmformats.cpp
M  +1    -8    kcms/formats/kcmformats.h
M  +0    -3    kcms/icons/iconsmodel.cpp
M  +0    -3    kcms/icons/iconsmodel.h
M  +0    -3    kcms/icons/main.cpp
M  +0    -3    kcms/icons/main.h
M  +0    -3    kcms/kfontinst/apps/CreateParent.h
M  +0    -3    kcms/kfontinst/apps/Installer.cpp
M  +0    -3    kcms/kfontinst/apps/Installer.h
M  +0    -3    kcms/kfontinst/apps/Printer.cpp
M  +0    -3    kcms/kfontinst/apps/Printer.h
M  +0    -3    kcms/kfontinst/apps/Viewer.cpp
M  +0    -3    kcms/kfontinst/apps/Viewer.h
M  +0    -3    kcms/kfontinst/dbus/FcConfig.cpp
M  +0    -3    kcms/kfontinst/dbus/FcConfig.h
M  +0    -3    kcms/kfontinst/dbus/Folder.cpp
M  +0    -3    kcms/kfontinst/dbus/Folder.h
M  +0    -3    kcms/kfontinst/dbus/FontInst.cpp
M  +0    -3    kcms/kfontinst/dbus/FontInst.h
M  +0    -3    kcms/kfontinst/dbus/Helper.cpp
M  +0    -3    kcms/kfontinst/dbus/Helper.h
M  +0    -3    kcms/kfontinst/dbus/Main.cpp
M  +0    -3    kcms/kfontinst/dbus/Utils.cpp
M  +0    -3    kcms/kfontinst/dbus/Utils.h
M  +0    -3    kcms/kfontinst/kcmfontinst/ActionLabel.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/ActionLabel.h
M  +0    -3    kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/DuplicatesDialog.h
M  +0    -3    kcms/kfontinst/kcmfontinst/FcQuery.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/FcQuery.h
M  +1    -3    kcms/kfontinst/kcmfontinst/FontFilter.cpp
M  +1    -3    kcms/kfontinst/kcmfontinst/FontFilter.h
M  +0    -3    kcms/kfontinst/kcmfontinst/FontList.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/FontList.h
M  +0    -3    kcms/kfontinst/kcmfontinst/FontsPackage.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/FontsPackage.h
M  +0    -3    kcms/kfontinst/kcmfontinst/GroupList.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/GroupList.h
M  +0    -3    kcms/kfontinst/kcmfontinst/JobRunner.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/JobRunner.h
M  +0    -3    kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/KCmFontInst.h
M  +0    -3    kcms/kfontinst/kcmfontinst/PreviewList.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/PreviewList.h
M  +0    -3    kcms/kfontinst/kcmfontinst/PrintDialog.cpp
M  +0    -3    kcms/kfontinst/kcmfontinst/PrintDialog.h
M  +0    -3    kcms/kfontinst/kio/FontInstInterface.cpp
M  +0    -3    kcms/kfontinst/kio/FontInstInterface.h
M  +0    -3    kcms/kfontinst/kio/KioFonts.cpp
M  +0    -3    kcms/kfontinst/kio/KioFonts.h
M  +0    -3    kcms/kfontinst/lib/Family.cpp
M  +0    -3    kcms/kfontinst/lib/Family.h
M  +0    -3    kcms/kfontinst/lib/Fc.cpp
M  +0    -3    kcms/kfontinst/lib/Fc.h
M  +0    -3    kcms/kfontinst/lib/FcEngine.cpp
M  +0    -3    kcms/kfontinst/lib/FcEngine.h
M  +0    -3    kcms/kfontinst/lib/File.cpp
M  +0    -3    kcms/kfontinst/lib/File.h
M  +0    -3    kcms/kfontinst/lib/KfiConstants.h
M  +0    -3    kcms/kfontinst/lib/Misc.cpp
M  +0    -3    kcms/kfontinst/lib/Misc.h
M  +0    -3    kcms/kfontinst/lib/Style.cpp
M  +0    -3    kcms/kfontinst/lib/Style.h
M  +0    -3    kcms/kfontinst/lib/WritingSystems.cpp
M  +0    -3    kcms/kfontinst/lib/WritingSystems.h
M  +0    -3    kcms/kfontinst/lib/XmlStrings.h
M  +0    -11   kcms/kfontinst/lib/kfontinst_export.h
M  +0    -3    kcms/kfontinst/thumbnail/FontThumbnail.cpp
M  +0    -3    kcms/kfontinst/thumbnail/FontThumbnail.h
M  +5    -10   kcms/kfontinst/viewpart/CharTip.cpp
M  +0    -3    kcms/kfontinst/viewpart/CharTip.h
M  +0    -3    kcms/kfontinst/viewpart/FontPreview.cpp
M  +0    -3    kcms/kfontinst/viewpart/FontPreview.h
M  +0    -3    kcms/kfontinst/viewpart/FontViewPart.cpp
M  +0    -3    kcms/kfontinst/viewpart/FontViewPart.h
M  +0    -3    kcms/kfontinst/viewpart/PreviewSelectAction.cpp
M  +0    -3    kcms/kfontinst/viewpart/PreviewSelectAction.h
M  +0    -2    kcms/krdb/krdb.cpp
M  +0    -10   klipper/systemclipboard/qtclipboard.cpp
M  +0    -10   klipper/systemclipboard/qtclipboard.h
M  +0    -10   klipper/systemclipboard/systemclipboard.cpp
M  +0    -10   klipper/systemclipboard/systemclipboard.h
M  +0    -10   klipper/systemclipboard/waylandclipboard.cpp
M  +0    -10   klipper/systemclipboard/waylandclipboard.h
M  +2    -2    klipper/systemclipboard/wlr-data-control-unstable-v1.xml
M  +0    -10   libkworkspace/kdisplaymanager.cpp
M  +0    -10   libkworkspace/kdisplaymanager.h
M  +0    -10   libkworkspace/sessionmanagement.cpp
M  +1    -10   libkworkspace/sessionmanagement.h
M  +1    -10   libkworkspace/sessionmanagementbackend.cpp
M  +1    -10   libkworkspace/sessionmanagementbackend.h
M  +1    -10   libkworkspace/tests/sessiontest.cpp
M  +0    -10   libkworkspace/tests/syncdbusenvtest.cpp
M  +0    -10   libkworkspace/updatelaunchenvjob.cpp
M  +0    -10   libkworkspace/updatelaunchenvjob.h
M  +3    -2    runners/kill/config_keys.h
M  +2    -1    runners/kill/killrunner.cpp
M  +3    -2    runners/kill/killrunner_config.cpp
M  +3    -2    runners/kill/killrunner_config.h
M  +1    -1    shell/osd.cpp
M  +1    -1    shell/osd.h

https://invent.kde.org/plasma/plasma-workspace/commit/fefe12dff6b1b2c700ae4c9efddbe188a6e050a9

diff --git a/applets/panelspacer/package/contents/ui/main.qml b/applets/panelspacer/package/contents/ui/main.qml
index eb77e5281..86dfb0754 100644
--- a/applets/panelspacer/package/contents/ui/main.qml
+++ b/applets/panelspacer/package/contents/ui/main.qml
@@ -2,14 +2,6 @@
     SPDX-FileCopyrightText: 2014 Marco Martin <mart at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You chenterX have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
 import QtQuick 2.0
diff --git a/applets/systemtray/package/contents/ui/ConfigGeneral.qml b/applets/systemtray/package/contents/ui/ConfigGeneral.qml
index 302b505bf..ef4465519 100644
--- a/applets/systemtray/package/contents/ui/ConfigGeneral.qml
+++ b/applets/systemtray/package/contents/ui/ConfigGeneral.qml
@@ -1,10 +1,8 @@
+/*
+    SPDX-FileCopyrightText: 2020 Konrad Materka <materka at gmail.com>
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
 
-
-/***************************************************************************
- *   SPDX-FileCopyrightText: 2020 Konrad Materka <materka at gmail.com>                 *
- *                                                                         *
- *   SPDX-License-Identifier: GPL-2.0-or-later
- ***************************************************************************/
 import QtQuick 2.14
 import QtQuick.Controls 2.14 as QQC2
 import QtQuick.Layouts 1.13
diff --git a/applets/systemtray/statusnotifieritemhost.h b/applets/systemtray/statusnotifieritemhost.h
index 7beb589a1..65d521491 100644
--- a/applets/systemtray/statusnotifieritemhost.h
+++ b/applets/systemtray/statusnotifieritemhost.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp
index b297286ea..9e64d239f 100644
--- a/applets/systemtray/statusnotifieritemsource.cpp
+++ b/applets/systemtray/statusnotifieritemsource.cpp
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/applets/systemtray/statusnotifieritemsource.h b/applets/systemtray/statusnotifieritemsource.h
index ef1b1e79e..98c7c883d 100644
--- a/applets/systemtray/statusnotifieritemsource.h
+++ b/applets/systemtray/statusnotifieritemsource.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/applets/systemtray/systemtraytypes.cpp b/applets/systemtray/systemtraytypes.cpp
index 85a6343d5..2cc1d8304 100644
--- a/applets/systemtray/systemtraytypes.cpp
+++ b/applets/systemtray/systemtraytypes.cpp
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/applets/systemtray/systemtraytypes.h b/applets/systemtray/systemtraytypes.h
index 44d545125..aec1f7974 100644
--- a/applets/systemtray/systemtraytypes.h
+++ b/applets/systemtray/systemtraytypes.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/dataengines/powermanagement/powermanagementengine.cpp b/dataengines/powermanagement/powermanagementengine.cpp
index 3f25f620b..3eed4cc57 100644
--- a/dataengines/powermanagement/powermanagementengine.cpp
+++ b/dataengines/powermanagement/powermanagementengine.cpp
@@ -1,7 +1,7 @@
 /*
     SPDX-FileCopyrightText: 2007 Aaron Seigo <aseigo at kde.org>
     SPDX-FileCopyrightText: 2007-2008 Sebastian Kuegler <sebas at kde.org>
-    CopyRight 2007 Maor Vanmak <mvanmak1 at gmail.com>
+    SPDX-FileCopyrightText: 2007 Maor Vanmak <mvanmak1 at gmail.com>
     SPDX-FileCopyrightText: 2008 Dario Freddi <drf54321 at gmail.com>
 
     SPDX-License-Identifier: LGPL-2.0-only
diff --git a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
index 0060734aa..55b480abf 100644
--- a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/dataengines/statusnotifieritem/statusnotifieritem_engine.h b/dataengines/statusnotifieritem/statusnotifieritem_engine.h
index e8827e649..4576b75ea 100644
--- a/dataengines/statusnotifieritem/statusnotifieritem_engine.h
+++ b/dataengines/statusnotifieritem/statusnotifieritem_engine.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
index ad809d5b1..a51be37ed 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.h b/dataengines/statusnotifieritem/statusnotifieritemsource.h
index da33439cb..2aea1f155 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemsource.h
+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
     SPDX-FileCopyrightText: 2009 Matthieu Gallien <matthieu_gallien at yahoo.fr>
 
diff --git a/dataengines/statusnotifieritem/systemtraytypes.cpp b/dataengines/statusnotifieritem/systemtraytypes.cpp
index 85a6343d5..2cc1d8304 100644
--- a/dataengines/statusnotifieritem/systemtraytypes.cpp
+++ b/dataengines/statusnotifieritem/systemtraytypes.cpp
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/dataengines/statusnotifieritem/systemtraytypes.h b/dataengines/statusnotifieritem/systemtraytypes.h
index 44d545125..aec1f7974 100644
--- a/dataengines/statusnotifieritem/systemtraytypes.h
+++ b/dataengines/statusnotifieritem/systemtraytypes.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-FileCopyrightText: 2009 Marco Martin <notmart at gmail.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
index 497f471f8..b5e55dddb 100644
--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for BBC's Weather from the UK Met Office */
diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
index 1f0629c58..9e6f245e3 100644
--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for BBC Weather from UKMET Office */
diff --git a/dataengines/weather/ions/envcan/ion_envcan.cpp b/dataengines/weather/ions/envcan/ion_envcan.cpp
index 238091444..9a7f5926f 100644
--- a/dataengines/weather/ions/envcan/ion_envcan.cpp
+++ b/dataengines/weather/ions/envcan/ion_envcan.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2011, 2019 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for Environment Canada XML data */
diff --git a/dataengines/weather/ions/envcan/ion_envcan.h b/dataengines/weather/ions/envcan/ion_envcan.h
index 1a6cfc141..e014bcc56 100644
--- a/dataengines/weather/ions/envcan/ion_envcan.h
+++ b/dataengines/weather/ions/envcan/ion_envcan.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009, 2019 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for Environment Canada XML data */
diff --git a/dataengines/weather/ions/noaa/ion_noaa.cpp b/dataengines/weather/ions/noaa/ion_noaa.cpp
index 0bb8753ba..e822b2316 100644
--- a/dataengines/weather/ions/noaa/ion_noaa.cpp
+++ b/dataengines/weather/ions/noaa/ion_noaa.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009, 2019 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for NOAA's National Weather Service XML data */
diff --git a/dataengines/weather/ions/noaa/ion_noaa.h b/dataengines/weather/ions/noaa/ion_noaa.h
index 518b6449e..5416efd8c 100644
--- a/dataengines/weather/ions/noaa/ion_noaa.h
+++ b/dataengines/weather/ions/noaa/ion_noaa.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009, 2019 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for NOAA's National Weather Service XML data */
diff --git a/dataengines/weather/ions/wetter.com/ion_wettercom.cpp b/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
index 2b4af6f88..f7abc5a80 100644
--- a/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
+++ b/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
@@ -5,16 +5,6 @@
     SPDX-FileCopyrightText: 2007-2009 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for weather data from wetter.com */
diff --git a/dataengines/weather/ions/wetter.com/ion_wettercom.h b/dataengines/weather/ions/wetter.com/ion_wettercom.h
index 090cb5c17..e5ca2bf49 100644
--- a/dataengines/weather/ions/wetter.com/ion_wettercom.h
+++ b/dataengines/weather/ions/wetter.com/ion_wettercom.h
@@ -5,16 +5,6 @@
     SPDX-FileCopyrightText: 2007-2009 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 /* Ion for weather data from wetter.com */
diff --git a/dataengines/weather/weatherengine.cpp b/dataengines/weather/weatherengine.cpp
index c81a3fe97..b08649d28 100644
--- a/dataengines/weather/weatherengine.cpp
+++ b/dataengines/weather/weatherengine.cpp
@@ -3,16 +3,6 @@
     SPDX-FileCopyrightText: 2009 Aaron Seigo <aseigo at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #include "weatherengine.h"
diff --git a/dataengines/weather/weatherengine.h b/dataengines/weather/weatherengine.h
index 3fe84111a..54b790ee4 100644
--- a/dataengines/weather/weatherengine.h
+++ b/dataengines/weather/weatherengine.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007-2009 Shawn Starr <shawn.starr at rogers.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #pragma once
diff --git a/doc/PolicyKit-kde/index.docbook b/doc/PolicyKit-kde/index.docbook
index d0756d378..6171a3400 100644
--- a/doc/PolicyKit-kde/index.docbook
+++ b/doc/PolicyKit-kde/index.docbook
@@ -68,10 +68,10 @@ actions and authorized applications.</para>
 &policykit-kde;
 </para>
 <para>
-Program SPDX-FileCopyrightText: 2008-2009 Daniel Nicoletti
+Program copyright 2008-2009 Daniel Nicoletti
 </para>
 <para>
-Documentation SPDX-FileCopyrightText: 2008-2009 Daniel Nicoletti
+Documentation copyright 2008-2009 Daniel Nicoletti
 </para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/kcms/autostart/autostart.cpp b/kcms/autostart/autostart.cpp
index 313225cfd..79aaacc27 100644
--- a/kcms/autostart/autostart.cpp
+++ b/kcms/autostart/autostart.cpp
@@ -1,20 +1,10 @@
 /*
-    SPDX-FileCopyrightText: 2006-2007 Stephen Leaf
-    smileaf at gmail.com
+    SPDX-FileCopyrightText: 2006-2007 Stephen Leaf <smileaf at gmail.com>
     SPDX-FileCopyrightText: 2008 Montel Laurent <montel at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
+
 #include "autostart.h"
 
 #include <KAboutData>
diff --git a/kcms/autostart/autostart.h b/kcms/autostart/autostart.h
index 472e730a8..ed8ebac82 100644
--- a/kcms/autostart/autostart.h
+++ b/kcms/autostart/autostart.h
@@ -1,19 +1,8 @@
 /*
-    SPDX-FileCopyrightText: 2006-2007 Stephen Leaf
-    smileaf at gmail.com
+    SPDX-FileCopyrightText: 2006-2007 Stephen Leaf <smileaf at gmail.com>
     SPDX-FileCopyrightText: 2008 Montel Laurent <montel at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 #pragma once
diff --git a/kcms/autostart/autostartmodel.cpp b/kcms/autostart/autostartmodel.cpp
index 0dea7132b..d1cc4cf53 100644
--- a/kcms/autostart/autostartmodel.cpp
+++ b/kcms/autostart/autostartmodel.cpp
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2020 Méven Car <meven.car at enioka.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
+
 #include "autostartmodel.h"
 
 #include <KConfigGroup>
diff --git a/kcms/autostart/autostartmodel.h b/kcms/autostart/autostartmodel.h
index 30cc5a6ef..6897c9c93 100644
--- a/kcms/autostart/autostartmodel.h
+++ b/kcms/autostart/autostartmodel.h
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2020 Méven Car <meven.car at enioka.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
+
 #pragma once
 
 #include <QAbstractListModel>
diff --git a/kcms/autostart/package/contents/ui/main.qml b/kcms/autostart/package/contents/ui/main.qml
index 4f7c21706..08f8290ca 100644
--- a/kcms/autostart/package/contents/ui/main.qml
+++ b/kcms/autostart/package/contents/ui/main.qml
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 Nicolas Fella <nicolas.fella at gmx.de
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 import QtQuick 2.10
diff --git a/kcms/colors/editor/kcolorschemeeditor.cpp b/kcms/colors/editor/kcolorschemeeditor.cpp
index 4d66e61b6..6af007ac0 100644
--- a/kcms/colors/editor/kcolorschemeeditor.cpp
+++ b/kcms/colors/editor/kcolorschemeeditor.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "scmeditordialog.h"
diff --git a/kcms/colors/editor/previewwidget.cpp b/kcms/colors/editor/previewwidget.cpp
index 4e69f5387..28b5ba3ee 100644
--- a/kcms/colors/editor/previewwidget.cpp
+++ b/kcms/colors/editor/previewwidget.cpp
@@ -1,18 +1,8 @@
 /* Preview widget for KDE Display color scheme setup module
     SPDX-FileCopyrightText: 2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
-    eventFilter code SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer @ kde.org>
+    SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer @ kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "previewwidget.h"
diff --git a/kcms/colors/editor/previewwidget.h b/kcms/colors/editor/previewwidget.h
index 344b9ab10..4fe5190c9 100644
--- a/kcms/colors/editor/previewwidget.h
+++ b/kcms/colors/editor/previewwidget.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/colors/editor/scmeditorcolors.cpp b/kcms/colors/editor/scmeditorcolors.cpp
index e08b320b5..6326ef5b2 100644
--- a/kcms/colors/editor/scmeditorcolors.cpp
+++ b/kcms/colors/editor/scmeditorcolors.cpp
@@ -3,16 +3,6 @@
     SPDX-FileCopyrightText: 2007 Jeremy Whiting <jpwhiting at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "scmeditorcolors.h"
diff --git a/kcms/colors/editor/scmeditorcolors.h b/kcms/colors/editor/scmeditorcolors.h
index bd3344c95..1710a6239 100644
--- a/kcms/colors/editor/scmeditorcolors.h
+++ b/kcms/colors/editor/scmeditorcolors.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/colors/editor/scmeditordialog.cpp b/kcms/colors/editor/scmeditordialog.cpp
index 8c57d8955..27103f906 100644
--- a/kcms/colors/editor/scmeditordialog.cpp
+++ b/kcms/colors/editor/scmeditordialog.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "scmeditordialog.h"
diff --git a/kcms/colors/editor/scmeditordialog.h b/kcms/colors/editor/scmeditordialog.h
index 1a12343f8..6297c58b8 100644
--- a/kcms/colors/editor/scmeditordialog.h
+++ b/kcms/colors/editor/scmeditordialog.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/colors/editor/scmeditoreffects.cpp b/kcms/colors/editor/scmeditoreffects.cpp
index 3013341cf..a344fed32 100644
--- a/kcms/colors/editor/scmeditoreffects.cpp
+++ b/kcms/colors/editor/scmeditoreffects.cpp
@@ -3,16 +3,6 @@
     SPDX-FileCopyrightText: 2007 Jeremy Whiting <jpwhiting at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "scmeditoreffects.h"
diff --git a/kcms/colors/editor/scmeditoreffects.h b/kcms/colors/editor/scmeditoreffects.h
index 5c3d2af74..c9dba3609 100644
--- a/kcms/colors/editor/scmeditoreffects.h
+++ b/kcms/colors/editor/scmeditoreffects.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/colors/editor/scmeditoroptions.cpp b/kcms/colors/editor/scmeditoroptions.cpp
index 77da45876..a7e6ec17e 100644
--- a/kcms/colors/editor/scmeditoroptions.cpp
+++ b/kcms/colors/editor/scmeditoroptions.cpp
@@ -3,16 +3,6 @@
     SPDX-FileCopyrightText: 2007 Jeremy Whiting <jpwhiting at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "scmeditoroptions.h"
diff --git a/kcms/colors/editor/scmeditoroptions.h b/kcms/colors/editor/scmeditoroptions.h
index 5164b34fb..1b472e3b8 100644
--- a/kcms/colors/editor/scmeditoroptions.h
+++ b/kcms/colors/editor/scmeditoroptions.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2016 Olivier Churlaud <olivier at churlaud.com>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/colors/editor/setpreviewwidget.cpp b/kcms/colors/editor/setpreviewwidget.cpp
index 0631b8e7e..c6a4f329a 100644
--- a/kcms/colors/editor/setpreviewwidget.cpp
+++ b/kcms/colors/editor/setpreviewwidget.cpp
@@ -1,18 +1,8 @@
 /* Preview widget for KDE Display color scheme setup module
     SPDX-FileCopyrightText: 2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
-    eventFilter code SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer @ kde.org>
+    SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "setpreviewwidget.h"
diff --git a/kcms/colors/editor/setpreviewwidget.h b/kcms/colors/editor/setpreviewwidget.h
index 8fdc6354b..f481b932e 100644
--- a/kcms/colors/editor/setpreviewwidget.h
+++ b/kcms/colors/editor/setpreviewwidget.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2008 Matthew Woehlke <mw_triad at users.sourceforge.net>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/kcms/formats/kcmformats.cpp b/kcms/formats/kcmformats.cpp
index 4a264686b..687f89bf6 100644
--- a/kcms/formats/kcmformats.cpp
+++ b/kcms/formats/kcmformats.cpp
@@ -3,14 +3,6 @@
     SPDX-FileCopyrightText: 2014 Sebastian Kügler <sebas at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
 */
 
 // own
diff --git a/kcms/formats/kcmformats.h b/kcms/formats/kcmformats.h
index 9414066e6..01c288967 100644
--- a/kcms/formats/kcmformats.h
+++ b/kcms/formats/kcmformats.h
@@ -3,15 +3,8 @@
     SPDX-FileCopyrightText: 2014 Sebastian Kügler <sebas at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
 */
+
 #pragma once
 
 #include <KCModule>
diff --git a/kcms/icons/iconsmodel.cpp b/kcms/icons/iconsmodel.cpp
index 4635c5af4..59eee1ec8 100644
--- a/kcms/icons/iconsmodel.cpp
+++ b/kcms/icons/iconsmodel.cpp
@@ -5,9 +5,6 @@
     KDE Frameworks 5 port SPDX-FileCopyrightText: 2013 Jonathan Riddell <jr at jriddell.org>
     SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde at privat.broulik.de>
 
-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/icons/iconsmodel.h b/kcms/icons/iconsmodel.h
index 9fc1e63cd..60717dd69 100644
--- a/kcms/icons/iconsmodel.h
+++ b/kcms/icons/iconsmodel.h
@@ -3,9 +3,6 @@
     KDE Frameworks 5 port SPDX-FileCopyrightText: 2013 Jonathan Riddell <jr at jriddell.org>
     SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde at privat.broulik.de>
 
-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/icons/main.cpp b/kcms/icons/main.cpp
index eebdc720b..ce3976698 100644
--- a/kcms/icons/main.cpp
+++ b/kcms/icons/main.cpp
@@ -8,9 +8,6 @@
     SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde at privat.broulik.de>
     SPDX-FileCopyrightText: 2019 Benjamin Port <benjamin.port at enioka.com>
 
-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/icons/main.h b/kcms/icons/main.h
index 975d53527..fc360fcb7 100644
--- a/kcms/icons/main.h
+++ b/kcms/icons/main.h
@@ -6,9 +6,6 @@
     SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde at privat.broulik.de>
     SPDX-FileCopyrightText: 2019 Benjamin Port <benjamin.port at enioka.com>
 
-    Requires the Qt widget libraries, available at no cost at
-    https://www.qt.io/
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/apps/CreateParent.h b/kcms/kfontinst/apps/CreateParent.h
index 7a6699997..93980ca56 100644
--- a/kcms/kfontinst/apps/CreateParent.h
+++ b/kcms/kfontinst/apps/CreateParent.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/apps/Installer.cpp b/kcms/kfontinst/apps/Installer.cpp
index abf0fe4d8..de0bfb4e2 100644
--- a/kcms/kfontinst/apps/Installer.cpp
+++ b/kcms/kfontinst/apps/Installer.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/apps/Installer.h b/kcms/kfontinst/apps/Installer.h
index 4f2446b83..a47e9bea7 100644
--- a/kcms/kfontinst/apps/Installer.h
+++ b/kcms/kfontinst/apps/Installer.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/apps/Printer.cpp b/kcms/kfontinst/apps/Printer.cpp
index 073323ff9..2966b219f 100644
--- a/kcms/kfontinst/apps/Printer.cpp
+++ b/kcms/kfontinst/apps/Printer.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/apps/Printer.h b/kcms/kfontinst/apps/Printer.h
index 3e86ef891..c79fbd3f3 100644
--- a/kcms/kfontinst/apps/Printer.h
+++ b/kcms/kfontinst/apps/Printer.h
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2011 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/apps/Viewer.cpp b/kcms/kfontinst/apps/Viewer.cpp
index 20d2777b4..c88487fdc 100644
--- a/kcms/kfontinst/apps/Viewer.cpp
+++ b/kcms/kfontinst/apps/Viewer.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/apps/Viewer.h b/kcms/kfontinst/apps/Viewer.h
index 5bc7bffe4..b0a7c9164 100644
--- a/kcms/kfontinst/apps/Viewer.h
+++ b/kcms/kfontinst/apps/Viewer.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/dbus/FcConfig.cpp b/kcms/kfontinst/dbus/FcConfig.cpp
index 3947752bc..8e9d64f3f 100644
--- a/kcms/kfontinst/dbus/FcConfig.cpp
+++ b/kcms/kfontinst/dbus/FcConfig.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/FcConfig.h b/kcms/kfontinst/dbus/FcConfig.h
index a6b9ffadc..8dfb469d8 100644
--- a/kcms/kfontinst/dbus/FcConfig.h
+++ b/kcms/kfontinst/dbus/FcConfig.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/dbus/Folder.cpp b/kcms/kfontinst/dbus/Folder.cpp
index 3ed8606c3..53afa1aa4 100644
--- a/kcms/kfontinst/dbus/Folder.cpp
+++ b/kcms/kfontinst/dbus/Folder.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/Folder.h b/kcms/kfontinst/dbus/Folder.h
index 9ecebf0f1..7de501207 100644
--- a/kcms/kfontinst/dbus/Folder.h
+++ b/kcms/kfontinst/dbus/Folder.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/dbus/FontInst.cpp b/kcms/kfontinst/dbus/FontInst.cpp
index 5b8bb69a6..ad8318c68 100644
--- a/kcms/kfontinst/dbus/FontInst.cpp
+++ b/kcms/kfontinst/dbus/FontInst.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/FontInst.h b/kcms/kfontinst/dbus/FontInst.h
index 94a1a5a1e..f88d9d7ed 100644
--- a/kcms/kfontinst/dbus/FontInst.h
+++ b/kcms/kfontinst/dbus/FontInst.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/dbus/Helper.cpp b/kcms/kfontinst/dbus/Helper.cpp
index 9cecfeee3..f1cfee675 100644
--- a/kcms/kfontinst/dbus/Helper.cpp
+++ b/kcms/kfontinst/dbus/Helper.cpp
@@ -2,9 +2,6 @@
     KHelper - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2010 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/Helper.h b/kcms/kfontinst/dbus/Helper.h
index 3ddf5442b..575a983cb 100644
--- a/kcms/kfontinst/dbus/Helper.h
+++ b/kcms/kfontinst/dbus/Helper.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2010 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/dbus/Main.cpp b/kcms/kfontinst/dbus/Main.cpp
index 5aa39b65f..0e6f2267c 100644
--- a/kcms/kfontinst/dbus/Main.cpp
+++ b/kcms/kfontinst/dbus/Main.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/Utils.cpp b/kcms/kfontinst/dbus/Utils.cpp
index de6f709e0..a71e85ae6 100644
--- a/kcms/kfontinst/dbus/Utils.cpp
+++ b/kcms/kfontinst/dbus/Utils.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/dbus/Utils.h b/kcms/kfontinst/dbus/Utils.h
index 571bdfe14..b09065695 100644
--- a/kcms/kfontinst/dbus/Utils.h
+++ b/kcms/kfontinst/dbus/Utils.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/ActionLabel.cpp b/kcms/kfontinst/kcmfontinst/ActionLabel.cpp
index ae0e83842..14cbb935e 100644
--- a/kcms/kfontinst/kcmfontinst/ActionLabel.cpp
+++ b/kcms/kfontinst/kcmfontinst/ActionLabel.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/ActionLabel.h b/kcms/kfontinst/kcmfontinst/ActionLabel.h
index 033c7d6a7..66fca39ce 100644
--- a/kcms/kfontinst/kcmfontinst/ActionLabel.h
+++ b/kcms/kfontinst/kcmfontinst/ActionLabel.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp b/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp
index ebb6f989e..1a8252370 100644
--- a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp
+++ b/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.h b/kcms/kfontinst/kcmfontinst/DuplicatesDialog.h
index 8a5978be9..8bc19ee83 100644
--- a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.h
+++ b/kcms/kfontinst/kcmfontinst/DuplicatesDialog.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
index 70efcc395..638d3ad15 100644
--- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp
+++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.h b/kcms/kfontinst/kcmfontinst/FcQuery.h
index d86c42da0..3554af1e0 100644
--- a/kcms/kfontinst/kcmfontinst/FcQuery.h
+++ b/kcms/kfontinst/kcmfontinst/FcQuery.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/FontFilter.cpp b/kcms/kfontinst/kcmfontinst/FontFilter.cpp
index 2d3da5df3..55334ce68 100644
--- a/kcms/kfontinst/kcmfontinst/FontFilter.cpp
+++ b/kcms/kfontinst/kcmfontinst/FontFilter.cpp
@@ -2,9 +2,7 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-    2019      Guo Yunhe <i at guoyunhe.me>
-
-    ----
+    SPDX-FileCopyrightText: 2019 Guo Yunhe <i at guoyunhe.me>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
diff --git a/kcms/kfontinst/kcmfontinst/FontFilter.h b/kcms/kfontinst/kcmfontinst/FontFilter.h
index d1323a8ec..1bdbd8a9e 100644
--- a/kcms/kfontinst/kcmfontinst/FontFilter.h
+++ b/kcms/kfontinst/kcmfontinst/FontFilter.h
@@ -4,9 +4,7 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *           2019      Guo Yunhe <i at guoyunhe.me>
- *
- * ----
+ * SPDX-FileCopyrightText:  2019 Guo Yunhe <i at guoyunhe.me>
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
diff --git a/kcms/kfontinst/kcmfontinst/FontList.cpp b/kcms/kfontinst/kcmfontinst/FontList.cpp
index ce7afef1e..9f000aa03 100644
--- a/kcms/kfontinst/kcmfontinst/FontList.cpp
+++ b/kcms/kfontinst/kcmfontinst/FontList.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/FontList.h b/kcms/kfontinst/kcmfontinst/FontList.h
index 1633ace2b..3f81cbab6 100644
--- a/kcms/kfontinst/kcmfontinst/FontList.h
+++ b/kcms/kfontinst/kcmfontinst/FontList.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/FontsPackage.cpp b/kcms/kfontinst/kcmfontinst/FontsPackage.cpp
index de9ab3d0a..942e4a3a5 100644
--- a/kcms/kfontinst/kcmfontinst/FontsPackage.cpp
+++ b/kcms/kfontinst/kcmfontinst/FontsPackage.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/FontsPackage.h b/kcms/kfontinst/kcmfontinst/FontsPackage.h
index 89353fe8b..fac216b54 100644
--- a/kcms/kfontinst/kcmfontinst/FontsPackage.h
+++ b/kcms/kfontinst/kcmfontinst/FontsPackage.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/GroupList.cpp b/kcms/kfontinst/kcmfontinst/GroupList.cpp
index 3bd80ffa1..70904890f 100644
--- a/kcms/kfontinst/kcmfontinst/GroupList.cpp
+++ b/kcms/kfontinst/kcmfontinst/GroupList.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/GroupList.h b/kcms/kfontinst/kcmfontinst/GroupList.h
index 49177f9d3..b194e690d 100644
--- a/kcms/kfontinst/kcmfontinst/GroupList.h
+++ b/kcms/kfontinst/kcmfontinst/GroupList.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/JobRunner.cpp b/kcms/kfontinst/kcmfontinst/JobRunner.cpp
index f8cbeaee9..a1edd4236 100644
--- a/kcms/kfontinst/kcmfontinst/JobRunner.cpp
+++ b/kcms/kfontinst/kcmfontinst/JobRunner.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/JobRunner.h b/kcms/kfontinst/kcmfontinst/JobRunner.h
index f752a614a..a6f7297c0 100644
--- a/kcms/kfontinst/kcmfontinst/JobRunner.h
+++ b/kcms/kfontinst/kcmfontinst/JobRunner.h
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
index e4562202e..acccd8491 100644
--- a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/KCmFontInst.h b/kcms/kfontinst/kcmfontinst/KCmFontInst.h
index 23d2818ce..4064f56af 100644
--- a/kcms/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcms/kfontinst/kcmfontinst/KCmFontInst.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/PreviewList.cpp b/kcms/kfontinst/kcmfontinst/PreviewList.cpp
index 114830ba9..03b8105ad 100644
--- a/kcms/kfontinst/kcmfontinst/PreviewList.cpp
+++ b/kcms/kfontinst/kcmfontinst/PreviewList.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/PreviewList.h b/kcms/kfontinst/kcmfontinst/PreviewList.h
index 8a6400d79..0021305bc 100644
--- a/kcms/kfontinst/kcmfontinst/PreviewList.h
+++ b/kcms/kfontinst/kcmfontinst/PreviewList.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kcmfontinst/PrintDialog.cpp b/kcms/kfontinst/kcmfontinst/PrintDialog.cpp
index 1c8d9e698..65775b1d2 100644
--- a/kcms/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcms/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kcmfontinst/PrintDialog.h b/kcms/kfontinst/kcmfontinst/PrintDialog.h
index 7b8f7c1c0..407dae47f 100644
--- a/kcms/kfontinst/kcmfontinst/PrintDialog.h
+++ b/kcms/kfontinst/kcmfontinst/PrintDialog.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kio/FontInstInterface.cpp b/kcms/kfontinst/kio/FontInstInterface.cpp
index ec419bbc8..6efd75591 100644
--- a/kcms/kfontinst/kio/FontInstInterface.cpp
+++ b/kcms/kfontinst/kio/FontInstInterface.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kio/FontInstInterface.h b/kcms/kfontinst/kio/FontInstInterface.h
index 6fd5b4ee9..9297495b8 100644
--- a/kcms/kfontinst/kio/FontInstInterface.h
+++ b/kcms/kfontinst/kio/FontInstInterface.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/kio/KioFonts.cpp b/kcms/kfontinst/kio/KioFonts.cpp
index 97a5d629e..86e3139d4 100644
--- a/kcms/kfontinst/kio/KioFonts.cpp
+++ b/kcms/kfontinst/kio/KioFonts.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/kio/KioFonts.h b/kcms/kfontinst/kio/KioFonts.h
index d4c4d8d10..7efacd33c 100644
--- a/kcms/kfontinst/kio/KioFonts.h
+++ b/kcms/kfontinst/kio/KioFonts.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/Family.cpp b/kcms/kfontinst/lib/Family.cpp
index 2d90da287..0f1876423 100644
--- a/kcms/kfontinst/lib/Family.cpp
+++ b/kcms/kfontinst/lib/Family.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/Family.h b/kcms/kfontinst/lib/Family.h
index 7a8c3f75a..5ac8968e7 100644
--- a/kcms/kfontinst/lib/Family.h
+++ b/kcms/kfontinst/lib/Family.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/Fc.cpp b/kcms/kfontinst/lib/Fc.cpp
index 513d5e7af..08119ca77 100644
--- a/kcms/kfontinst/lib/Fc.cpp
+++ b/kcms/kfontinst/lib/Fc.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/Fc.h b/kcms/kfontinst/lib/Fc.h
index e1ebcd56e..9c52a78db 100644
--- a/kcms/kfontinst/lib/Fc.h
+++ b/kcms/kfontinst/lib/Fc.h
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/FcEngine.cpp b/kcms/kfontinst/lib/FcEngine.cpp
index b59468e80..a08b61295 100644
--- a/kcms/kfontinst/lib/FcEngine.cpp
+++ b/kcms/kfontinst/lib/FcEngine.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/FcEngine.h b/kcms/kfontinst/lib/FcEngine.h
index de0bd6bac..8ea9adc70 100644
--- a/kcms/kfontinst/lib/FcEngine.h
+++ b/kcms/kfontinst/lib/FcEngine.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/File.cpp b/kcms/kfontinst/lib/File.cpp
index 2a681b437..3a0e26162 100644
--- a/kcms/kfontinst/lib/File.cpp
+++ b/kcms/kfontinst/lib/File.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/File.h b/kcms/kfontinst/lib/File.h
index da066e6b3..3491e7eb1 100644
--- a/kcms/kfontinst/lib/File.h
+++ b/kcms/kfontinst/lib/File.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/KfiConstants.h b/kcms/kfontinst/lib/KfiConstants.h
index f97af0c7f..cb388e95e 100644
--- a/kcms/kfontinst/lib/KfiConstants.h
+++ b/kcms/kfontinst/lib/KfiConstants.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/Misc.cpp b/kcms/kfontinst/lib/Misc.cpp
index 8e10f655d..b9c7c4dc1 100644
--- a/kcms/kfontinst/lib/Misc.cpp
+++ b/kcms/kfontinst/lib/Misc.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/Misc.h b/kcms/kfontinst/lib/Misc.h
index 3c3505933..071230451 100644
--- a/kcms/kfontinst/lib/Misc.h
+++ b/kcms/kfontinst/lib/Misc.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/Style.cpp b/kcms/kfontinst/lib/Style.cpp
index 47734c950..f1e8b0198 100644
--- a/kcms/kfontinst/lib/Style.cpp
+++ b/kcms/kfontinst/lib/Style.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/Style.h b/kcms/kfontinst/lib/Style.h
index 62419b158..a6bbcc59b 100644
--- a/kcms/kfontinst/lib/Style.h
+++ b/kcms/kfontinst/lib/Style.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/WritingSystems.cpp b/kcms/kfontinst/lib/WritingSystems.cpp
index 382525fa0..a77cb5308 100644
--- a/kcms/kfontinst/lib/WritingSystems.cpp
+++ b/kcms/kfontinst/lib/WritingSystems.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/lib/WritingSystems.h b/kcms/kfontinst/lib/WritingSystems.h
index 9bf58c921..c2f0a90f9 100644
--- a/kcms/kfontinst/lib/WritingSystems.h
+++ b/kcms/kfontinst/lib/WritingSystems.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/XmlStrings.h b/kcms/kfontinst/lib/XmlStrings.h
index c3b45f049..75e3939ab 100644
--- a/kcms/kfontinst/lib/XmlStrings.h
+++ b/kcms/kfontinst/lib/XmlStrings.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2009 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/lib/kfontinst_export.h b/kcms/kfontinst/lib/kfontinst_export.h
index 2c7cd5521..b8a42a5db 100644
--- a/kcms/kfontinst/lib/kfontinst_export.h
+++ b/kcms/kfontinst/lib/kfontinst_export.h
@@ -2,17 +2,6 @@
     SPDX-FileCopyrightText: 2006 Matthias Kretz <kretz at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-
 */
 
 #pragma once
diff --git a/kcms/kfontinst/thumbnail/FontThumbnail.cpp b/kcms/kfontinst/thumbnail/FontThumbnail.cpp
index bb3a0bcb6..7ff74bdcf 100644
--- a/kcms/kfontinst/thumbnail/FontThumbnail.cpp
+++ b/kcms/kfontinst/thumbnail/FontThumbnail.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/thumbnail/FontThumbnail.h b/kcms/kfontinst/thumbnail/FontThumbnail.h
index e93fe17d8..8be9cb961 100644
--- a/kcms/kfontinst/thumbnail/FontThumbnail.h
+++ b/kcms/kfontinst/thumbnail/FontThumbnail.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/viewpart/CharTip.cpp b/kcms/kfontinst/viewpart/CharTip.cpp
index 868dd70e2..71ed1f0a4 100644
--- a/kcms/kfontinst/viewpart/CharTip.cpp
+++ b/kcms/kfontinst/viewpart/CharTip.cpp
@@ -1,21 +1,16 @@
 /*
     KFontInst - KDE Font Installer
 
-    SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
+    Inspired by konq_filetip.cc
 
-    ----
+    SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
+    SPDX-FileCopyrightText: 1998, 1999 Torben Weis <weis at kde.org>
+    SPDX-FileCopyrightText: 2000, 2001, 2002 David Faure <faure at kde.org>
+    SPDX-FileCopyrightText: 2004 Martin Koller <m.koller at surfeu.at>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-/*
- * Inspired by konq_filetip.cc
- *
- * SPDX-FileCopyrightText: 1998, 1999 Torben Weis <weis at kde.org>
- * SPDX-FileCopyrightText: 2000, 2001, 2002 David Faure <faure at kde.org>
- * SPDX-FileCopyrightText: 2004 Martin Koller <m.koller at surfeu.at>
- */
-
 #include "CharTip.h"
 #include "FontPreview.h"
 #include "UnicodeCategories.h"
diff --git a/kcms/kfontinst/viewpart/CharTip.h b/kcms/kfontinst/viewpart/CharTip.h
index 2ba1cd661..a2f6cf916 100644
--- a/kcms/kfontinst/viewpart/CharTip.h
+++ b/kcms/kfontinst/viewpart/CharTip.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/viewpart/FontPreview.cpp b/kcms/kfontinst/viewpart/FontPreview.cpp
index 2b4246fe6..52089e18a 100644
--- a/kcms/kfontinst/viewpart/FontPreview.cpp
+++ b/kcms/kfontinst/viewpart/FontPreview.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/viewpart/FontPreview.h b/kcms/kfontinst/viewpart/FontPreview.h
index 883e386e4..51b5caf6a 100644
--- a/kcms/kfontinst/viewpart/FontPreview.h
+++ b/kcms/kfontinst/viewpart/FontPreview.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/viewpart/FontViewPart.cpp b/kcms/kfontinst/viewpart/FontViewPart.cpp
index 98768c6e7..534c9ded9 100644
--- a/kcms/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcms/kfontinst/viewpart/FontViewPart.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/viewpart/FontViewPart.h b/kcms/kfontinst/viewpart/FontViewPart.h
index 97eb6d49f..97c2e16da 100644
--- a/kcms/kfontinst/viewpart/FontViewPart.h
+++ b/kcms/kfontinst/viewpart/FontViewPart.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/kfontinst/viewpart/PreviewSelectAction.cpp b/kcms/kfontinst/viewpart/PreviewSelectAction.cpp
index 4348a44bf..332e39505 100644
--- a/kcms/kfontinst/viewpart/PreviewSelectAction.cpp
+++ b/kcms/kfontinst/viewpart/PreviewSelectAction.cpp
@@ -2,9 +2,6 @@
     KFontInst - KDE Font Installer
 
     SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
-
-    ----
-
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
diff --git a/kcms/kfontinst/viewpart/PreviewSelectAction.h b/kcms/kfontinst/viewpart/PreviewSelectAction.h
index f3a2e10df..da13708f4 100644
--- a/kcms/kfontinst/viewpart/PreviewSelectAction.h
+++ b/kcms/kfontinst/viewpart/PreviewSelectAction.h
@@ -4,9 +4,6 @@
  * KFontInst - KDE Font Installer
  *
  * SPDX-FileCopyrightText: 2003-2007 Craig Drummond <craig at kde.org>
- *
- * ----
- *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index e6aad1e2a..5ebb2cf13 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -1,6 +1,4 @@
 /*
-
-
     KRDB - puts current KDE color scheme into preprocessor statements
     cats specially written application default files and uses xrdb -merge to
     write to RESOURCE_MANAGER. Thus it gives a  simple way to make non-KDE
diff --git a/klipper/systemclipboard/qtclipboard.cpp b/klipper/systemclipboard/qtclipboard.cpp
index ba5d71faf..906ce7476 100644
--- a/klipper/systemclipboard/qtclipboard.cpp
+++ b/klipper/systemclipboard/qtclipboard.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "qtclipboard.h"
diff --git a/klipper/systemclipboard/qtclipboard.h b/klipper/systemclipboard/qtclipboard.h
index 04d0e3c44..e2467b12a 100644
--- a/klipper/systemclipboard/qtclipboard.h
+++ b/klipper/systemclipboard/qtclipboard.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/klipper/systemclipboard/systemclipboard.cpp b/klipper/systemclipboard/systemclipboard.cpp
index 2ac25058b..291fd9f6a 100644
--- a/klipper/systemclipboard/systemclipboard.cpp
+++ b/klipper/systemclipboard/systemclipboard.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "systemclipboard.h"
diff --git a/klipper/systemclipboard/systemclipboard.h b/klipper/systemclipboard/systemclipboard.h
index 2073c67dc..84ea199f3 100644
--- a/klipper/systemclipboard/systemclipboard.h
+++ b/klipper/systemclipboard/systemclipboard.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/klipper/systemclipboard/waylandclipboard.cpp b/klipper/systemclipboard/waylandclipboard.cpp
index 9e7323559..f89aea307 100644
--- a/klipper/systemclipboard/waylandclipboard.cpp
+++ b/klipper/systemclipboard/waylandclipboard.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "waylandclipboard.h"
diff --git a/klipper/systemclipboard/waylandclipboard.h b/klipper/systemclipboard/waylandclipboard.h
index 57f4e173a..1c4462002 100644
--- a/klipper/systemclipboard/waylandclipboard.h
+++ b/klipper/systemclipboard/waylandclipboard.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/klipper/systemclipboard/wlr-data-control-unstable-v1.xml b/klipper/systemclipboard/wlr-data-control-unstable-v1.xml
index d05297ffc..75e8671b0 100644
--- a/klipper/systemclipboard/wlr-data-control-unstable-v1.xml
+++ b/klipper/systemclipboard/wlr-data-control-unstable-v1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <protocol name="wlr_data_control_unstable_v1">
   <copyright>
-    SPDX-FileCopyrightText: 2018 Simon Ser
-    SPDX-FileCopyrightText: 2019 Ivan Molodetskikh
+    Copyright © 2018 Simon Ser
+    Copyright © 2019 Ivan Molodetskikh
 
     Permission to use, copy, modify, distribute, and sell this
     software and its documentation for any purpose is hereby granted
diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp
index 9e452a342..b0a927dde 100644
--- a/libkworkspace/kdisplaymanager.cpp
+++ b/libkworkspace/kdisplaymanager.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2004 Oswald Buddenhagen <ossi at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "kdisplaymanager.h"
diff --git a/libkworkspace/kdisplaymanager.h b/libkworkspace/kdisplaymanager.h
index 73f892218..c3ecdbcbb 100644
--- a/libkworkspace/kdisplaymanager.h
+++ b/libkworkspace/kdisplaymanager.h
@@ -3,16 +3,6 @@
     SPDX-FileCopyrightText: 2005 Stephan Kulow <coolo at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/libkworkspace/sessionmanagement.cpp b/libkworkspace/sessionmanagement.cpp
index 813aaf499..72ac1c669 100644
--- a/libkworkspace/sessionmanagement.cpp
+++ b/libkworkspace/sessionmanagement.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "sessionmanagement.h"
diff --git a/libkworkspace/sessionmanagement.h b/libkworkspace/sessionmanagement.h
index 8fffa6070..a437bac27 100644
--- a/libkworkspace/sessionmanagement.h
+++ b/libkworkspace/sessionmanagement.h
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
+
 #pragma once
 
 #include "kworkspace_export.h"
diff --git a/libkworkspace/sessionmanagementbackend.cpp b/libkworkspace/sessionmanagementbackend.cpp
index 36e7e0ee6..83cd39395 100644
--- a/libkworkspace/sessionmanagementbackend.cpp
+++ b/libkworkspace/sessionmanagementbackend.cpp
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
+
 #include "sessionmanagementbackend.h"
 
 #include <QDebug>
diff --git a/libkworkspace/sessionmanagementbackend.h b/libkworkspace/sessionmanagementbackend.h
index b2022bd32..6dd7b8e79 100644
--- a/libkworkspace/sessionmanagementbackend.h
+++ b/libkworkspace/sessionmanagementbackend.h
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
+
 #pragma once
 
 #include <KConfigWatcher>
diff --git a/libkworkspace/tests/sessiontest.cpp b/libkworkspace/tests/sessiontest.cpp
index b0fbf88fb..bd4d25f75 100644
--- a/libkworkspace/tests/sessiontest.cpp
+++ b/libkworkspace/tests/sessiontest.cpp
@@ -2,17 +2,8 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
+
 #include <sessionmanagement.h>
 
 #include <QCoreApplication>
diff --git a/libkworkspace/tests/syncdbusenvtest.cpp b/libkworkspace/tests/syncdbusenvtest.cpp
index eb8e5dd55..7e50f8690 100644
--- a/libkworkspace/tests/syncdbusenvtest.cpp
+++ b/libkworkspace/tests/syncdbusenvtest.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2019 David Edmundson <davidedmundson at kde.org>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include <QCoreApplication>
diff --git a/libkworkspace/updatelaunchenvjob.cpp b/libkworkspace/updatelaunchenvjob.cpp
index 00abd74c8..12f8308e1 100644
--- a/libkworkspace/updatelaunchenvjob.cpp
+++ b/libkworkspace/updatelaunchenvjob.cpp
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde at broulik.de>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #include "updatelaunchenvjob.h"
diff --git a/libkworkspace/updatelaunchenvjob.h b/libkworkspace/updatelaunchenvjob.h
index 11637e2a1..4ae242f69 100644
--- a/libkworkspace/updatelaunchenvjob.h
+++ b/libkworkspace/updatelaunchenvjob.h
@@ -2,16 +2,6 @@
     SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde at broulik.de>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the Lesser GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
 */
 
 #pragma once
diff --git a/runners/kill/config_keys.h b/runners/kill/config_keys.h
index 2e16ad397..d309c626b 100644
--- a/runners/kill/config_keys.h
+++ b/runners/kill/config_keys.h
@@ -1,5 +1,6 @@
-/* Copyright 2009  <Jan Gerrit Marker> <jangerrit at weiler-marker.com>
-    Copyright 2020  <Alexander Lohnau> <alexander.lohnau at gmx.de>
+/*
+    SPDX-FileCopyrightText: 2009 Jan Gerrit Marker <jangerrit at weiler-marker.com>
+    SPDX-FileCopyrightText: 2020 Alexander Lohnau <alexander.lohnau at gmx.de>
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
diff --git a/runners/kill/killrunner.cpp b/runners/kill/killrunner.cpp
index 6096ce2e9..5cd2a7899 100644
--- a/runners/kill/killrunner.cpp
+++ b/runners/kill/killrunner.cpp
@@ -1,4 +1,5 @@
-/* SPDX-FileCopyrightText: 2009 Jan Gerrit Marker <jangerrit at weiler-marker.com>
+/*
+    SPDX-FileCopyrightText: 2009 Jan Gerrit Marker <jangerrit at weiler-marker.com>
     SPDX-FileCopyrightText: 2020 Alexander Lohnau <alexander.lohnau at gmx.de>
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
diff --git a/runners/kill/killrunner_config.cpp b/runners/kill/killrunner_config.cpp
index de0c866aa..e869aa823 100644
--- a/runners/kill/killrunner_config.cpp
+++ b/runners/kill/killrunner_config.cpp
@@ -1,5 +1,6 @@
-/* Copyright 2009  <Jan Gerrit Marker> <jangerrit at weiler-marker.com>
-    Copyright 2020  <Alexander Lohnau> <alexander.lohnau at gmx.de>
+/*
+    SPDX-FileCopyrightText: 2009 Jan Gerrit Marker <jangerrit at weiler-marker.com>
+    SPDX-FileCopyrightText: 2020 Alexander Lohnau <alexander.lohnau at gmx.de>
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
diff --git a/runners/kill/killrunner_config.h b/runners/kill/killrunner_config.h
index 65fb0b164..450317551 100644
--- a/runners/kill/killrunner_config.h
+++ b/runners/kill/killrunner_config.h
@@ -1,5 +1,6 @@
-/* Copyright 2009  <Jan Gerrit Marker> <jangerrit at weiler-marker.com>
-    Copyright 2020  <Alexander Lohnau> <alexander.lohnau at gmx.de>
+/*
+    SPDX-FileCopyrightText: 2009 Jan Gerrit Marker <jangerrit at weiler-marker.com>
+    SPDX-FileCopyrightText: 2020 Alexander Lohnau <alexander.lohnau at gmx.de>
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
diff --git a/shell/osd.cpp b/shell/osd.cpp
index 75c31b754..d6479a74d 100644
--- a/shell/osd.cpp
+++ b/shell/osd.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 (c) Martin Klapetek <mklapetek at kde.org>
+    SPDX-FileCopyrightText: 2014 Martin Klapetek <mklapetek at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
diff --git a/shell/osd.h b/shell/osd.h
index 91689abbf..31562c801 100644
--- a/shell/osd.h
+++ b/shell/osd.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 (c) Martin Klapetek <mklapetek at kde.org>
+    SPDX-FileCopyrightText: 2014 Martin Klapetek <mklapetek at kde.org>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */



More information about the kde-doc-english mailing list