Manual fixes to license headers

_clang-format

@@ -1,27 +1,9 @@
 ---
 # SPDX-License-Identifier: MIT
 #
-# Copyright (C) 2019 Christoph Cullmann <cullmann@kde.org>
-# Copyright (C) 2019 Gernot Gebhard <gebhard@absint.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullmann@kde.org>
+# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebhard@absint.com>
+
 
 # Style for C++
 Language: Cpp

core/document.cpp

@@ -1,9 +1,8 @@
 /*
     SPDX-FileCopyrightText: 2004-2005 Enrico Ros <eros.kde@email.it>
     SPDX-FileCopyrightText: 2004-2008 Albert Astals Cid <aacid@kde.org>
-    SPDX-FileCopyrightText: 2017, 2018 Klarälvdalens Datakonsult AB a KDAB Group
-    company, info@kdab.com. Work sponsored by the
-    LiMux project of the city of Munich
+    SPDX-FileCopyrightText: 2017, 2018 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
+    Work sponsored by the LiMux project of the city of Munich
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */

generators/dvi/length.h

@@ -7,7 +7,7 @@
 // SPDX-FileCopyrightText: 2005 Stefan Kebekus
 // SPDX-FileCopyrightText: 2006 Wilfried Huss
 //
-// SPDX-License-Identifier: GPL-2.0-or-later.
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _length_h_
 #define _length_h_