Manual conversions & formatting

alex1701c · alex1701c · commit 4e432e17ff93 · 2021-05-21T15:16:40.000+02:00
diff --git a/LICENSES/BSD-2-Clause.txt b/LICENSES/BSD-2-Clause.txt
@@ -0,0 +1,22 @@
+Copyright (c) <year> <owner> All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
@@ -1,19 +1,7 @@
-/* This file is part of KDevelop
+/*
+    This file is part of KDevelop
     SPDX-FileCopyrightText: 2002, 2003 Roberto Raggi <roberto@kdevelop.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 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, see
-    <http://www.gnu.org/licenses/>
+    SPDX-License-Identifier: LGPL-2.0-or-later
 */
 
 #include "ast.h"
diff --git a/lib/kdev4-php/cmake/FindKDevPlatform.cmake b/lib/kdev4-php/cmake/FindKDevPlatform.cmake
@@ -35,7 +35,7 @@
 #    Parameters should be the directories containing the templates.
 #
 # SPDX-FileCopyrightText: 2007 Andreas Pakulat <apaku@gmx.de>
-# Redistribution and use is allowed according to the terms of the BSD license.
+# SPDX-License-Identifier: BSD-2-Clause
 
 set(_KDevPlatform_FIND_QUIETLY ${KDevPlatform_FIND_QUIETLY})
 find_package( KDevPlatform ${KDevPlatform_FIND_VERSION} NO_MODULE )
diff --git a/tools/po2xmi.cpp b/tools/po2xmi.cpp
@@ -1,9 +1,7 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2014-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
-
-    @author Ralf Habacker <ralf.habacker@freenet.de>
-
+    SPDX-FileCopyrightText: 2014-2020 Ralf Habacker <ralf.habacker@freenet.de>
 */
 
 #include "shared.h"
diff --git a/tools/shared.cpp b/tools/shared.cpp
@@ -1,9 +1,7 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2014-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
-
-    @author Ralf Habacker <ralf.habacker@freenet.de>
-
+    SPDX-FileCopyrightText: 2014-2020 Ralf Habacker <ralf.habacker@freenet.de>
 */
 
 #include "shared.h"
diff --git a/tools/shared.h b/tools/shared.h
@@ -1,9 +1,7 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2014-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
-
-    @author Ralf Habacker <ralf.habacker@freenet.de>
-
+    SPDX-FileCopyrightText: 2014-2020 Ralf Habacker <ralf.habacker@freenet.de>
 */
 
 #ifndef SHARED_H
diff --git a/tools/xmi2pot.cpp b/tools/xmi2pot.cpp
@@ -1,9 +1,7 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2014-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
-
-    @author Ralf Habacker <ralf.habacker@freenet.de>
-
+    SPDX-FileCopyrightText: 2014-2020 Ralf Habacker <ralf.habacker@freenet.de>
 */
 
 #include <stdlib.h>
diff --git a/umbrello/basictypes.cpp b/umbrello/basictypes.cpp
@@ -1,20 +1,6 @@
 /*
     SPDX-FileCopyrightText: 2011 Andi Fischer <andi.fischer@hispeed.ch>
-
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "basictypes.h"
diff --git a/umbrello/basictypes.h b/umbrello/basictypes.h
@@ -1,20 +1,6 @@
 /*
     SPDX-FileCopyrightText: 2011 Andi Fischer <andi.fischer@hispeed.ch>
-
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef BASICTYPES_H
diff --git a/umbrello/codegenerators/js/jswriter.cpp b/umbrello/codegenerators/js/jswriter.cpp
@@ -1,11 +1,7 @@
 /*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License js published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
     SPDX-FileCopyrightText: 2003 Alexander Blum <blum@kewbee.de>
     SPDX-FileCopyrightText: 2004-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "jswriter.h"
diff --git a/umbrello/codegenerators/php/php5writer.cpp b/umbrello/codegenerators/php/php5writer.cpp
@@ -2,7 +2,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 
     SPDX-FileCopyrightText: 2002 Heiko Nardmann <h.nardmann@secunet.de>
-    Thorsten Kunz   <tk AT bytecrash DOT net>
+    SPDX-FileCopyrightText: 2004 Thorsten Kunz <tk AT bytecrash DOT net>
     SPDX-FileCopyrightText: 2003-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
 
diff --git a/umbrello/codegenerators/php/php5writer.h b/umbrello/codegenerators/php/php5writer.h
@@ -2,7 +2,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 
     SPDX-FileCopyrightText: 2002 Heiko Nardmann <h.nardmann@secunet.de>
-    Thorsten Kunz   <tk AT bytecrash DOT net>
+    SPDX-FileCopyrightText: 2004 Thorsten Kunz <tk AT bytecrash DOT net>
     SPDX-FileCopyrightText: 2003-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
 
diff --git a/umbrello/dialogs/pages/codeimportoptionspage.cpp b/umbrello/dialogs/pages/codeimportoptionspage.cpp
@@ -1,20 +1,7 @@
 /*
     SPDX-FileCopyrightText: 2011-2014 Ralf Habacker <ralf.habacker@freenet.de>
 
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 // own header
diff --git a/umbrello/dialogs/pages/codeimportoptionspage.h b/umbrello/dialogs/pages/codeimportoptionspage.h
@@ -1,20 +1,7 @@
 /*
     SPDX-FileCopyrightText: 2011-2014 Ralf Habacker <ralf.habacker@freenet.de>
 
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef CODEIMPORTOPTIONSPAGE_H
diff --git a/umbrello/dialogs/umlenumliteraldialog.cpp b/umbrello/dialogs/umlenumliteraldialog.cpp
@@ -1,8 +1,5 @@
 /*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+    SPDX-License-Identifier: GPL-3.0-or-later
 
     SPDX-FileCopyrightText: 2015 Tzvetelin Katchov <katchov@gmail.com>
     SPDX-FileCopyrightText: 2002-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
diff --git a/umbrello/dialogs/umlenumliteraldialog.h b/umbrello/dialogs/umlenumliteraldialog.h
@@ -1,8 +1,5 @@
 /*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
+    SPDX-License-Identifier: GPL-3.0-or-later
 
     SPDX-FileCopyrightText: 2015 Tzvetelin Katchov <katchov@gmail.com>
     SPDX-FileCopyrightText: 2002-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
diff --git a/umbrello/dialogs/widgets/umlstereotypewidget.cpp b/umbrello/dialogs/widgets/umlstereotypewidget.cpp
@@ -1,8 +1,6 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    copyright (C) 2002-2014,2019
-    Umbrello UML Modeller Authors <umbrello-devel@kde.org>
+    SPDX-FileCopyrightText: 2002-2014,2019 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
 
 #include "umlstereotypewidget.h"
diff --git a/umbrello/dialogs/widgets/umlstereotypewidget.h b/umbrello/dialogs/widgets/umlstereotypewidget.h
@@ -1,8 +1,6 @@
 /*
     SPDX-License-Identifier: GPL-2.0-or-later
-
-    copyright (C) 2002-2014,2019
-    Umbrello UML Modeller Authors <umbrello-devel@kde.org>
+    SPDX-FileCopyrightText: 2002-2014,2019 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
 
 #ifndef UMLSTEREOTYPEWIDGET_H
diff --git a/umbrello/docgenerators/xmi2docbook.xsl b/umbrello/docgenerators/xmi2docbook.xsl
@@ -12,12 +12,7 @@
     SPDX-FileCopyrightText: 2005 Oliver M. Kellogg <okellogg@users.sourceforge.net>
     SPDX-FileCopyrightText: 2006 Gaël de Chalendar (Kleag) <kleag@free.fr>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation. A copy of the license may be found at
-    http://www.gnu.org/licenses/gpl.html
-
-    Version:  June, 16 2006
+    SPDX-License-Identifier: GPL-3.0-only
 
     xmlns="http://www.w3.org/1999/xhtml"
 -->
diff --git a/umbrello/uml1model/category.h b/umbrello/uml1model/category.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2002-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlassociationlist.h b/umbrello/uml1model/umlassociationlist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2004-2007 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlattributelist.h b/umbrello/uml1model/umlattributelist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2004-2014 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlentityattributelist.h b/umbrello/uml1model/umlentityattributelist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2004-2014 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlentityconstraintlist.h b/umbrello/uml1model/umlentityconstraintlist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2004-2014 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlenumliterallist.h b/umbrello/uml1model/umlenumliterallist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2004-2007 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umloperationlist.h b/umbrello/uml1model/umloperationlist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2003-2007 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/uml1model/umlpackagelist.h b/umbrello/uml1model/umlpackagelist.h
@@ -1,5 +1,4 @@
 /*
-
     SPDX-License-Identifier: GPL-2.0-or-later
     SPDX-FileCopyrightText: 2003-2007 Umbrello UML Modeller Authors <umbrello-devel@kde.org>
 */
diff --git a/umbrello/umlwidgets/layoutgrid.cpp b/umbrello/umlwidgets/layoutgrid.cpp
@@ -2,20 +2,7 @@
     SPDX-FileCopyrightText: 2011 Andi Fischer <andi.fischer@hispeed.ch>
     SPDX-FileCopyrightText: 2012 Ralf Habacker <ralf.habacker@freenet.de>
 
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "layoutgrid.h"
diff --git a/umbrello/umlwidgets/layoutgrid.h b/umbrello/umlwidgets/layoutgrid.h
@@ -2,20 +2,7 @@
     SPDX-FileCopyrightText: 2011 Andi Fischer <andi.fischer@hispeed.ch>
     SPDX-FileCopyrightText: 2012 Ralf Habacker <ralf.habacker@freenet.de>
 
-    This is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This software 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 package; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-    Boston, MA 02110-1301, USA.
+    SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef LAYOUTGRID_H

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`# Parameters should be the directories containing the templates.`
`36`	`36`	`#`
`37`	`37`	`# SPDX-FileCopyrightText: 2007 Andreas Pakulat <apaku@gmx.de>`
`38`		`-# Redistribution and use is allowed according to the terms of the BSD license.`
	`38`	`+# SPDX-License-Identifier: BSD-2-Clause`
`39`	`39`
`40`	`40`	`set(_KDevPlatform_FIND_QUIETLY ${KDevPlatform_FIND_QUIETLY})`
`41`	`41`	`find_package( KDevPlatform ${KDevPlatform_FIND_VERSION} NO_MODULE )`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/*`
`2`		`-`
`3`	`2`	`SPDX-License-Identifier: GPL-2.0-or-later`
`4`	`3`	`SPDX-FileCopyrightText: 2002-2020 Umbrello UML Modeller Authors <umbrello-devel@kde.org>`
`5`	`4`	`*/`