From fe67ae26aedcb95d3dc6dad6a55839bd15ca1751 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Fri, 21 May 2021 07:53:47 +0200 Subject: [PATCH] Convert licsense headers to SPDX --- .../package/contents/ui/ChangePassword.qml | 20 +++------------- .../contents/ui/ChangeWalletPassword.qml | 18 ++------------ kcms/users/package/contents/ui/CreateUser.qml | 18 ++------------ .../package/contents/ui/UserDetailsPage.qml | 22 ++++------------- kcms/users/package/contents/ui/main.qml | 22 ++++------------- kcms/users/src/kcm.cpp | 24 ++++--------------- kcms/users/src/kcm.h | 20 +++------------- kcms/users/src/user.cpp | 24 ++++--------------- kcms/users/src/user.h | 22 ++++------------- kcms/users/src/usermodel.cpp | 22 ++++------------- kcms/users/src/usermodel.h | 22 ++++------------- kcms/users/src/usersessions.h | 22 ++++------------- 12 files changed, 45 insertions(+), 211 deletions(-) diff --git a/kcms/users/package/contents/ui/ChangePassword.qml b/kcms/users/package/contents/ui/ChangePassword.qml index 8f5ec46d2..83a5a27e1 100644 --- a/kcms/users/package/contents/ui/ChangePassword.qml +++ b/kcms/users/package/contents/ui/ChangePassword.qml @@ -1,21 +1,7 @@ /* - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ import QtQuick 2.6 diff --git a/kcms/users/package/contents/ui/ChangeWalletPassword.qml b/kcms/users/package/contents/ui/ChangeWalletPassword.qml index 1f71fd776..248552d48 100644 --- a/kcms/users/package/contents/ui/ChangeWalletPassword.qml +++ b/kcms/users/package/contents/ui/ChangeWalletPassword.qml @@ -1,21 +1,7 @@ /* - Copyright 2020 Nate Graham + SPDX-FileCopyrightText: 2020 Nate Graham - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ import QtQuick 2.6 diff --git a/kcms/users/package/contents/ui/CreateUser.qml b/kcms/users/package/contents/ui/CreateUser.qml index 8f3d4868b..e624d84b3 100644 --- a/kcms/users/package/contents/ui/CreateUser.qml +++ b/kcms/users/package/contents/ui/CreateUser.qml @@ -1,21 +1,7 @@ /* - Copyright 2020 Carson Black + SPDX-FileCopyrightText: 2020 Carson Black - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ import QtQuick 2.6 diff --git a/kcms/users/package/contents/ui/UserDetailsPage.qml b/kcms/users/package/contents/ui/UserDetailsPage.qml index 57e2b7fb8..2c2e8afa6 100644 --- a/kcms/users/package/contents/ui/UserDetailsPage.qml +++ b/kcms/users/package/contents/ui/UserDetailsPage.qml @@ -1,22 +1,8 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ import QtQuick 2.6 diff --git a/kcms/users/package/contents/ui/main.qml b/kcms/users/package/contents/ui/main.qml index 6cc92e484..8f0e8f337 100644 --- a/kcms/users/package/contents/ui/main.qml +++ b/kcms/users/package/contents/ui/main.qml @@ -1,22 +1,8 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ import QtQuick 2.6 diff --git a/kcms/users/src/kcm.cpp b/kcms/users/src/kcm.cpp index 6254d23db..2f335a4a3 100644 --- a/kcms/users/src/kcm.cpp +++ b/kcms/users/src/kcm.cpp @@ -1,23 +1,9 @@ /* - Copyright 2016-2018 Jan Grulich - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2016-2018 Jan Grulich + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "kcm.h" diff --git a/kcms/users/src/kcm.h b/kcms/users/src/kcm.h index 18245f2a8..99228456b 100644 --- a/kcms/users/src/kcm.h +++ b/kcms/users/src/kcm.h @@ -1,21 +1,7 @@ /* - Copyright 2016-2018 Jan Grulich - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2016-2018 Jan Grulich + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #pragma once diff --git a/kcms/users/src/user.cpp b/kcms/users/src/user.cpp index e35dbe988..a096fdc7a 100644 --- a/kcms/users/src/user.cpp +++ b/kcms/users/src/user.cpp @@ -1,23 +1,9 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - Copyright 2020 David Redondo - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + SPDX-FileCopyrightText: 2020 David Redondo + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "user.h" diff --git a/kcms/users/src/user.h b/kcms/users/src/user.h index 3cab01441..d8ebea1a4 100644 --- a/kcms/users/src/user.h +++ b/kcms/users/src/user.h @@ -1,22 +1,8 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #pragma once diff --git a/kcms/users/src/usermodel.cpp b/kcms/users/src/usermodel.cpp index 1bea08705..e1ee46d71 100644 --- a/kcms/users/src/usermodel.cpp +++ b/kcms/users/src/usermodel.cpp @@ -1,22 +1,8 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "usermodel.h" diff --git a/kcms/users/src/usermodel.h b/kcms/users/src/usermodel.h index 06597a064..d736f345e 100644 --- a/kcms/users/src/usermodel.h +++ b/kcms/users/src/usermodel.h @@ -1,22 +1,8 @@ /* - Copyright 2019 Nicolas Fella - Copyright 2020 Carson Black - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . + SPDX-FileCopyrightText: 2019 Nicolas Fella + SPDX-FileCopyrightText: 2020 Carson Black + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #pragma once diff --git a/kcms/users/src/usersessions.h b/kcms/users/src/usersessions.h index 997dc5687..f1319a748 100644 --- a/kcms/users/src/usersessions.h +++ b/kcms/users/src/usersessions.h @@ -1,20 +1,8 @@ -/************************************************************************************* - * Copyright (C) 2013 by Alejandro Fiestas Olivares * - * * - * 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 2 * - * of the License, or (at your option) any later version. * - * * - * 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 * - *************************************************************************************/ +/* + SPDX-FileCopyrightText: 2013 Alejandro Fiestas Olivares + + SPDX-License-Identifier: GPL-2.0-or-later +*/ #pragma once