From 2a81e21f5eb2f2b3cf67e8d0194219057604b525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 22 May 2017 23:42:47 +0200 Subject: [PATCH] GH-1876 Clarify license of GroupView The LGPL code that came from KDE has been removed back in 2014. It was replaced with a different implementation, made in a separate repository. See commits: a17caba2c9c2aa5960581db01e4b66472a9c019c b82eb5873e99dce6aec735b08929e3add52e53e7 --- COPYING.md | 20 -------------------- application/groupview/GroupView.cpp | 15 +++++++++++++++ application/groupview/GroupView.h | 15 +++++++++++++++ application/groupview/GroupedProxyModel.cpp | 15 +++++++++++++++ application/groupview/GroupedProxyModel.h | 15 +++++++++++++++ application/groupview/VisualGroup.cpp | 15 +++++++++++++++ application/groupview/VisualGroup.h | 15 +++++++++++++++ 7 files changed, 90 insertions(+), 20 deletions(-) diff --git a/COPYING.md b/COPYING.md index 9e47c46b9..1603a4b1f 100644 --- a/COPYING.md +++ b/COPYING.md @@ -60,26 +60,6 @@ You should have received a copy of the GNU Lesser General Public License along with libnbt++. If not, see . -# Group View - - Copyright (C) 2007 Rafael Fernández López - Copyright (C) 2007 John Tapsell - - 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, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - # rainbow (KGuiAddons) Copyright (C) 2007 Matthew Woehlke diff --git a/application/groupview/GroupView.cpp b/application/groupview/GroupView.cpp index ec5f409a6..6178db0b5 100644 --- a/application/groupview/GroupView.cpp +++ b/application/groupview/GroupView.cpp @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "GroupView.h" #include diff --git a/application/groupview/GroupView.h b/application/groupview/GroupView.h index 37c37f2f5..a3f8a400b 100644 --- a/application/groupview/GroupView.h +++ b/application/groupview/GroupView.h @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #pragma once #include diff --git a/application/groupview/GroupedProxyModel.cpp b/application/groupview/GroupedProxyModel.cpp index 81f0a0c3f..e7d4670ee 100644 --- a/application/groupview/GroupedProxyModel.cpp +++ b/application/groupview/GroupedProxyModel.cpp @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "GroupedProxyModel.h" #include "GroupView.h" diff --git a/application/groupview/GroupedProxyModel.h b/application/groupview/GroupedProxyModel.h index 12edee0f8..dc39346f6 100644 --- a/application/groupview/GroupedProxyModel.h +++ b/application/groupview/GroupedProxyModel.h @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #pragma once #include diff --git a/application/groupview/VisualGroup.cpp b/application/groupview/VisualGroup.cpp index 235ca0239..e6f23af00 100644 --- a/application/groupview/VisualGroup.cpp +++ b/application/groupview/VisualGroup.cpp @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "VisualGroup.h" #include diff --git a/application/groupview/VisualGroup.h b/application/groupview/VisualGroup.h index d8d1f1455..940acd7af 100644 --- a/application/groupview/VisualGroup.h +++ b/application/groupview/VisualGroup.h @@ -1,3 +1,18 @@ +/* Copyright 2013-2017 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #pragma once #include