Fix & clean up SPDX conversions

generators/chm/lib/bitfiddle.h

@@ -1,21 +1,9 @@
 /*
-
     SPDX-FileCopyrightText: 2003 Razvan Cojocaru <razvanco@gmx.net>
     Most of the code in this file is a modified version of code from
     Pabs' GPL chmdeco project, credits and thanks go to him.
 
     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.
-
 */
 
 inline unsigned short UINT16ARRAY(const void *x)

generators/comicbook/qnatsort.cpp

@@ -2,21 +2,8 @@
     Natural order sorting of strings which contains numbers.
 
     SPDX-FileCopyrightText: 2007 Tobias Koenig <tokoe@kde.org>
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
     based on the natural order code by Martin Pool <mbp sourcefrog net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License version 2 or at your option version 3 as published by
-    the Free Software Foundation.
-
-    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 "qnatsort.h"

generators/comicbook/qnatsort.h

@@ -2,21 +2,8 @@
     Natural order sorting of strings which contains numbers.
 
     SPDX-FileCopyrightText: 2007 Tobias Koenig <tokoe@kde.org>
+    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
     based on the natural order code by Martin Pool <mbp sourcefrog net>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License version 2 or at your option version 3 as published by
-    the Free Software Foundation.
-
-    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.
 */
 
 #ifndef QNATSORT_H

generators/dvi/TeXFont.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _TEXFONT_H
 #define _TEXFONT_H

generators/dvi/TeXFont_PFB.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 // This file is compiled only if the FreeType library is present on
 // the system

generators/dvi/TeXFont_PFB.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 // This file is compiled only if the FreeType library is present on
 // the system

generators/dvi/TeXFont_TFM.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/TeXFont_TFM.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _TEXFONT_TFM_H
 #define _TEXFONT_TFM_H

generators/dvi/anchor.h

@@ -5,7 +5,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef ANCHOR_H
 #define ANCHOR_H

generators/dvi/bigEndianByteReader.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/bigEndianByteReader.h

@@ -1,10 +1,7 @@
 // -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; c-brace-offset: 0; -*-
-/* This file is part of KDVI SPDX-FileCopyrightText: 2001 Stefan Kebekus (kebekus@kde.org)
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License
-   as published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+/* This file is part of KDVI
+    SPDX-FileCopyrightText: 2001 Stefan Kebekus (kebekus@kde.org)
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 /**

generators/dvi/dviFile.h

@@ -5,8 +5,8 @@
 // Class that represents a DVI file. Part of KDVI - A DVI previewing
 // plugin for kviewshell.
 //
-// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus. Distributed under the GPL.
-//
+// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _DVIFILE_H
 #define _DVIFILE_H

generators/dvi/dviRenderer.cpp

@@ -6,8 +6,7 @@
 // Part of KDVI- A previewer for TeX DVI files.
 //
 // SPDX-FileCopyrightText: 2001-2005 Stefan Kebekus
-// Distributed under the GPL
-//
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/dviRenderer.h

@@ -5,7 +5,8 @@
 // Class for rendering TeX DVI files.
 // Part of KDVI- A previewer for TeX DVI files.
 //
-// SPDX-FileCopyrightText: 2001-2006 Stefan Kebekus. Distributed under the GPL.
+// SPDX-FileCopyrightText: 2001-2006 Stefan Kebekus
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _dvirenderer_h_
 #define _dvirenderer_h_

generators/dvi/dviRenderer_dr.cpp

@@ -10,7 +10,7 @@
 //
 // SPDX-FileCopyrightText: 2004-2005 Wilfried Huss
 // SPDX-FileCopyrightText: 2004-2006 Stefan Kebekus.
-//  Distributed under the GPL.
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "dviRenderer.h"
 

generators/dvi/dviRenderer_prescan.cpp

@@ -3,8 +3,8 @@
 //
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
-// (C) 2003--2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-FileCopyrightText: 2003-2004 Stefan Kebekus
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/fontEncoding.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/fontEncoding.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _FONTENCODING_H
 #define _FONTENCODING_H

generators/dvi/fontEncodingPool.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/fontEncodingPool.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _FONTENCODINGPOOL_H
 #define _FONTENCODINGPOOL_H

generators/dvi/fontMap.cpp

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/fontMap.h

@@ -4,7 +4,7 @@
 // Part of KDVI - A DVI previewer for the KDE desktop environment
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _FONTMAP_H
 #define _FONTMAP_H

generators/dvi/fontpool.cpp

@@ -3,7 +3,7 @@
 // fontpool.cpp
 //
 // SPDX-FileCopyrightText: 2001-2005 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/fontpool.h

@@ -2,7 +2,7 @@
 // fontpool.h
 //
 // SPDX-FileCopyrightText: 2001-2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _FONTPOOL_H
 #define _FONTPOOL_H

generators/dvi/hyperlink.h

@@ -4,7 +4,8 @@
 //
 // Part of KDVI- A previewer for TeX DVI files.
 //
-// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus. Distributed under the GPL.
+// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _hyperlink_h_
 #define _hyperlink_h_

generators/dvi/length.cpp

@@ -5,7 +5,7 @@
 //
 // SPDX-FileCopyrightText: 2003 Stefan Kebekus
 // SPDX-FileCopyrightText: 2006 Wilfried Huss
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/length.h

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

generators/dvi/pageNumber.h

@@ -5,7 +5,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef PAGENUMBER_H
 #define PAGENUMBER_H

generators/dvi/pageSize.cpp

@@ -4,7 +4,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2002-2003 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/pageSize.h

@@ -5,7 +5,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2002-2005 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef PAGESIZE_H
 #define PAGESIZE_H

generators/dvi/prebookmark.h

@@ -1,11 +1,8 @@
 // -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; c-brace-offset: 0; -*-
-/***************************************************************************
- *   SPDX-FileCopyrightText: 2005 Stefan Kebekus *
- *   kebekus@kde.org                                                       *
- *                                                                         *
- *                                                                         *
- *   SPDX-License-Identifier: GPL-2.0-or-later
- ***************************************************************************/
+/*
+    SPDX-FileCopyrightText: 2005 Stefan Kebekus <kebekus@kde.org>
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
 
 #ifndef _PREBOOKMARK_H_
 #define _PREBOOKMARK_H_

generators/dvi/psgs.cpp

@@ -5,7 +5,7 @@
 // Part of KDVI - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/psgs.h

@@ -5,7 +5,7 @@
 // Part of KDVI - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _PSGS_H_
 #define _PSGS_H_

generators/dvi/simplePageSize.cpp

@@ -4,7 +4,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2002-2005 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <config.h>
 

generators/dvi/simplePageSize.h

@@ -5,7 +5,7 @@
 // Part of KVIEWSHELL - A framework for multipage text/gfx viewers
 //
 // SPDX-FileCopyrightText: 2002-2004 Stefan Kebekus
-// Distributed under the GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef SIMPLEPAGESIZE_H
 #define SIMPLEPAGESIZE_H

generators/dvi/textBox.h

@@ -4,7 +4,8 @@
 //
 // Part of KDVI- A previewer for TeX DVI files.
 //
-// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus. Distributed under the GPL.
+// SPDX-FileCopyrightText: 2004-2005 Stefan Kebekus
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef _textbox_h_
 #define _textbox_h_