diff --git a/src/collectionpage/attributes/expirecollectionattribute.h b/src/collectionpage/attributes/expirecollectionattribute.h --- a/src/collectionpage/attributes/expirecollectionattribute.h +++ b/src/collectionpage/attributes/expirecollectionattribute.h @@ -2,9 +2,10 @@ Copyright (c) 2011-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/collectionpage/attributes/expirecollectionattribute.cpp b/src/collectionpage/attributes/expirecollectionattribute.cpp --- a/src/collectionpage/attributes/expirecollectionattribute.cpp +++ b/src/collectionpage/attributes/expirecollectionattribute.cpp @@ -2,9 +2,10 @@ Copyright (c) 2011-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/collectionpage/collectiongeneralpage.h b/src/collectionpage/collectiongeneralpage.h --- a/src/collectionpage/collectiongeneralpage.h +++ b/src/collectionpage/collectiongeneralpage.h @@ -1,9 +1,10 @@ /* Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/collectionpage/collectiongeneralpage.cpp b/src/collectionpage/collectiongeneralpage.cpp --- a/src/collectionpage/collectiongeneralpage.cpp +++ b/src/collectionpage/collectiongeneralpage.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/accountconfigorderdialog.h b/src/folder/accountconfigorderdialog.h --- a/src/folder/accountconfigorderdialog.h +++ b/src/folder/accountconfigorderdialog.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/accountconfigorderdialog.cpp b/src/folder/accountconfigorderdialog.cpp --- a/src/folder/accountconfigorderdialog.cpp +++ b/src/folder/accountconfigorderdialog.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/entitycollectionorderproxymodel.h b/src/folder/entitycollectionorderproxymodel.h --- a/src/folder/entitycollectionorderproxymodel.h +++ b/src/folder/entitycollectionorderproxymodel.h @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/entitycollectionorderproxymodel.cpp b/src/folder/entitycollectionorderproxymodel.cpp --- a/src/folder/entitycollectionorderproxymodel.cpp +++ b/src/folder/entitycollectionorderproxymodel.cpp @@ -2,9 +2,10 @@ Copyright (c) 2010-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/favoritecollectionorderproxymodel.h b/src/folder/favoritecollectionorderproxymodel.h --- a/src/folder/favoritecollectionorderproxymodel.h +++ b/src/folder/favoritecollectionorderproxymodel.h @@ -2,9 +2,10 @@ Copyright (c) 2017 David Faure - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/favoritecollectionorderproxymodel.cpp b/src/folder/favoritecollectionorderproxymodel.cpp --- a/src/folder/favoritecollectionorderproxymodel.cpp +++ b/src/folder/favoritecollectionorderproxymodel.cpp @@ -2,9 +2,10 @@ Copyright (c) 2017 David Faure - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldercollectionmonitor.h b/src/folder/foldercollectionmonitor.h --- a/src/folder/foldercollectionmonitor.h +++ b/src/folder/foldercollectionmonitor.h @@ -1,9 +1,10 @@ /* Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldercollectionmonitor.cpp b/src/folder/foldercollectionmonitor.cpp --- a/src/folder/foldercollectionmonitor.cpp +++ b/src/folder/foldercollectionmonitor.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/folderselectiondialog.h b/src/folder/folderselectiondialog.h --- a/src/folder/folderselectiondialog.h +++ b/src/folder/folderselectiondialog.h @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp --- a/src/folder/folderselectiondialog.cpp +++ b/src/folder/folderselectiondialog.cpp @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldersettings.h b/src/folder/foldersettings.h --- a/src/folder/foldersettings.h +++ b/src/folder/foldersettings.h @@ -1,9 +1,10 @@ /* Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldersettings.cpp b/src/folder/foldersettings.cpp --- a/src/folder/foldersettings.cpp +++ b/src/folder/foldersettings.cpp @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldertreeview.h b/src/folder/foldertreeview.h --- a/src/folder/foldertreeview.h +++ b/src/folder/foldertreeview.h @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldertreeview.cpp b/src/folder/foldertreeview.cpp --- a/src/folder/foldertreeview.cpp +++ b/src/folder/foldertreeview.cpp @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldertreewidget.h b/src/folder/foldertreewidget.h --- a/src/folder/foldertreewidget.h +++ b/src/folder/foldertreewidget.h @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - The program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/folder/foldertreewidget.cpp b/src/folder/foldertreewidget.cpp --- a/src/folder/foldertreewidget.cpp +++ b/src/folder/foldertreewidget.cpp @@ -2,9 +2,10 @@ Copyright (c) 2009-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/interfaces/mailinterfaces.h b/src/interfaces/mailinterfaces.h --- a/src/interfaces/mailinterfaces.h +++ b/src/interfaces/mailinterfaces.h @@ -2,9 +2,10 @@ Copyright (c) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Andras Mantia - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/job/expirejob.h b/src/job/expirejob.h --- a/src/job/expirejob.h +++ b/src/job/expirejob.h @@ -3,7 +3,8 @@ * * 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; version 2 of the License + * 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 diff --git a/src/job/expirejob.cpp b/src/job/expirejob.cpp --- a/src/job/expirejob.cpp +++ b/src/job/expirejob.cpp @@ -3,7 +3,8 @@ * * 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; version 2 of the License + * 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 diff --git a/src/job/folderjob.h b/src/job/folderjob.h --- a/src/job/folderjob.h +++ b/src/job/folderjob.h @@ -2,9 +2,10 @@ * * Copyright (c) 2003 Zack Rusin * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * 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 diff --git a/src/job/folderjob.cpp b/src/job/folderjob.cpp --- a/src/job/folderjob.cpp +++ b/src/job/folderjob.cpp @@ -2,9 +2,10 @@ * * Copyright (c) 2003 Zack Rusin * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * 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 diff --git a/src/job/jobscheduler.h b/src/job/jobscheduler.h --- a/src/job/jobscheduler.h +++ b/src/job/jobscheduler.h @@ -3,7 +3,8 @@ * * 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; version 2 of the License + * 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 diff --git a/src/job/jobscheduler.cpp b/src/job/jobscheduler.cpp --- a/src/job/jobscheduler.cpp +++ b/src/job/jobscheduler.cpp @@ -3,7 +3,8 @@ * * 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; version 2 of the License + * 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 diff --git a/src/kernel/mailkernel.h b/src/kernel/mailkernel.h --- a/src/kernel/mailkernel.h +++ b/src/kernel/mailkernel.h @@ -2,9 +2,10 @@ Copyright (c) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Andras Mantia - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/kernel/mailkernel.cpp b/src/kernel/mailkernel.cpp --- a/src/kernel/mailkernel.cpp +++ b/src/kernel/mailkernel.cpp @@ -2,9 +2,10 @@ Copyright (c) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Andras Mantia - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrule.h b/src/search/searchrule/searchrule.h --- a/src/search/searchrule/searchrule.h +++ b/src/search/searchrule/searchrule.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrule.cpp b/src/search/searchrule/searchrule.cpp --- a/src/search/searchrule/searchrule.cpp +++ b/src/search/searchrule/searchrule.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchruledate.h b/src/search/searchrule/searchruledate.h --- a/src/search/searchrule/searchruledate.h +++ b/src/search/searchrule/searchruledate.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchruledate.cpp b/src/search/searchrule/searchruledate.cpp --- a/src/search/searchrule/searchruledate.cpp +++ b/src/search/searchrule/searchruledate.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchruleencryption.h b/src/search/searchrule/searchruleencryption.h --- a/src/search/searchrule/searchruleencryption.h +++ b/src/search/searchrule/searchruleencryption.h @@ -1,9 +1,10 @@ /* Copyright (c) 2017 Daniel Vrátil - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchruleencryption.cpp b/src/search/searchrule/searchruleencryption.cpp --- a/src/search/searchrule/searchruleencryption.cpp +++ b/src/search/searchrule/searchruleencryption.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2017 Daniel Vrátil - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulenumerical.h b/src/search/searchrule/searchrulenumerical.h --- a/src/search/searchrule/searchrulenumerical.h +++ b/src/search/searchrule/searchrulenumerical.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulenumerical.cpp b/src/search/searchrule/searchrulenumerical.cpp --- a/src/search/searchrule/searchrulenumerical.cpp +++ b/src/search/searchrule/searchrulenumerical.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulestatus.h b/src/search/searchrule/searchrulestatus.h --- a/src/search/searchrule/searchrulestatus.h +++ b/src/search/searchrule/searchrulestatus.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulestatus.cpp b/src/search/searchrule/searchrulestatus.cpp --- a/src/search/searchrule/searchrulestatus.cpp +++ b/src/search/searchrule/searchrulestatus.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulestring.h b/src/search/searchrule/searchrulestring.h --- a/src/search/searchrule/searchrulestring.h +++ b/src/search/searchrule/searchrulestring.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/searchrule/searchrulestring.cpp b/src/search/searchrule/searchrulestring.cpp --- a/src/search/searchrule/searchrulestring.cpp +++ b/src/search/searchrule/searchrulestring.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/daterulewidgethandler.h b/src/search/widgethandler/daterulewidgethandler.h --- a/src/search/widgethandler/daterulewidgethandler.h +++ b/src/search/widgethandler/daterulewidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/daterulewidgethandler.cpp b/src/search/widgethandler/daterulewidgethandler.cpp --- a/src/search/widgethandler/daterulewidgethandler.cpp +++ b/src/search/widgethandler/daterulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/encryptionwidgethandler.h b/src/search/widgethandler/encryptionwidgethandler.h --- a/src/search/widgethandler/encryptionwidgethandler.h +++ b/src/search/widgethandler/encryptionwidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2017 Daniel Vrátil - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/encryptionwidgethandler.cpp b/src/search/widgethandler/encryptionwidgethandler.cpp --- a/src/search/widgethandler/encryptionwidgethandler.cpp +++ b/src/search/widgethandler/encryptionwidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2017 Daniel Vrátil - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/headersrulerwidgethandler.h b/src/search/widgethandler/headersrulerwidgethandler.h --- a/src/search/widgethandler/headersrulerwidgethandler.h +++ b/src/search/widgethandler/headersrulerwidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/headersrulerwidgethandler.cpp b/src/search/widgethandler/headersrulerwidgethandler.cpp --- a/src/search/widgethandler/headersrulerwidgethandler.cpp +++ b/src/search/widgethandler/headersrulerwidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/messagerulewidgethandler.h b/src/search/widgethandler/messagerulewidgethandler.h --- a/src/search/widgethandler/messagerulewidgethandler.h +++ b/src/search/widgethandler/messagerulewidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/messagerulewidgethandler.cpp b/src/search/widgethandler/messagerulewidgethandler.cpp --- a/src/search/widgethandler/messagerulewidgethandler.cpp +++ b/src/search/widgethandler/messagerulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/numericdoublerulewidgethandler.h b/src/search/widgethandler/numericdoublerulewidgethandler.h --- a/src/search/widgethandler/numericdoublerulewidgethandler.h +++ b/src/search/widgethandler/numericdoublerulewidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/numericdoublerulewidgethandler.cpp b/src/search/widgethandler/numericdoublerulewidgethandler.cpp --- a/src/search/widgethandler/numericdoublerulewidgethandler.cpp +++ b/src/search/widgethandler/numericdoublerulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/numericrulewidgethandler.cpp b/src/search/widgethandler/numericrulewidgethandler.cpp --- a/src/search/widgethandler/numericrulewidgethandler.cpp +++ b/src/search/widgethandler/numericrulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/statusrulewidgethandler.h b/src/search/widgethandler/statusrulewidgethandler.h --- a/src/search/widgethandler/statusrulewidgethandler.h +++ b/src/search/widgethandler/statusrulewidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/statusrulewidgethandler.cpp b/src/search/widgethandler/statusrulewidgethandler.cpp --- a/src/search/widgethandler/statusrulewidgethandler.cpp +++ b/src/search/widgethandler/statusrulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/tagrulewidgethandler.h b/src/search/widgethandler/tagrulewidgethandler.h --- a/src/search/widgethandler/tagrulewidgethandler.h +++ b/src/search/widgethandler/tagrulewidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp --- a/src/search/widgethandler/tagrulewidgethandler.cpp +++ b/src/search/widgethandler/tagrulewidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/textrulerwidgethandler.h b/src/search/widgethandler/textrulerwidgethandler.h --- a/src/search/widgethandler/textrulerwidgethandler.h +++ b/src/search/widgethandler/textrulerwidgethandler.h @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/search/widgethandler/textrulerwidgethandler.cpp b/src/search/widgethandler/textrulerwidgethandler.cpp --- a/src/search/widgethandler/textrulerwidgethandler.cpp +++ b/src/search/widgethandler/textrulerwidgethandler.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2013-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/tag/addtagdialog.h b/src/tag/addtagdialog.h --- a/src/tag/addtagdialog.h +++ b/src/tag/addtagdialog.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/tag/addtagdialog.cpp b/src/tag/addtagdialog.cpp --- a/src/tag/addtagdialog.cpp +++ b/src/tag/addtagdialog.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/tag/tagwidget.h b/src/tag/tagwidget.h --- a/src/tag/tagwidget.h +++ b/src/tag/tagwidget.h @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/tag/tagwidget.cpp b/src/tag/tagwidget.cpp --- a/src/tag/tagwidget.cpp +++ b/src/tag/tagwidget.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/util/resourcereadconfigfile.h b/src/util/resourcereadconfigfile.h --- a/src/util/resourcereadconfigfile.h +++ b/src/util/resourcereadconfigfile.h @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/util/resourcereadconfigfile.cpp b/src/util/resourcereadconfigfile.cpp --- a/src/util/resourcereadconfigfile.cpp +++ b/src/util/resourcereadconfigfile.cpp @@ -1,9 +1,10 @@ /* Copyright (c) 2015-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/widgets/favoritecollectionwidget.h b/src/widgets/favoritecollectionwidget.h --- a/src/widgets/favoritecollectionwidget.h +++ b/src/widgets/favoritecollectionwidget.h @@ -2,9 +2,10 @@ Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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 diff --git a/src/widgets/favoritecollectionwidget.cpp b/src/widgets/favoritecollectionwidget.cpp --- a/src/widgets/favoritecollectionwidget.cpp +++ b/src/widgets/favoritecollectionwidget.cpp @@ -2,9 +2,10 @@ Copyright (c) 2012-2018 Montel Laurent - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + 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