diff --git a/messageviewer/src/header/headerstrategy.h b/messageviewer/src/header/headerstrategy.h --- a/messageviewer/src/header/headerstrategy.h +++ b/messageviewer/src/header/headerstrategy.h @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/header/headerstrategy.cpp b/messageviewer/src/header/headerstrategy.cpp --- a/messageviewer/src/header/headerstrategy.cpp +++ b/messageviewer/src/header/headerstrategy.cpp @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/header/headerstyle.h b/messageviewer/src/header/headerstyle.h --- a/messageviewer/src/header/headerstyle.h +++ b/messageviewer/src/header/headerstyle.h @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/header/headerstyle.cpp b/messageviewer/src/header/headerstyle.cpp --- a/messageviewer/src/header/headerstyle.cpp +++ b/messageviewer/src/header/headerstyle.cpp @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/header/richheaderstrategy.h b/messageviewer/src/header/richheaderstrategy.h --- a/messageviewer/src/header/richheaderstrategy.h +++ b/messageviewer/src/header/richheaderstrategy.h @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/header/richheaderstrategy.cpp b/messageviewer/src/header/richheaderstrategy.cpp --- a/messageviewer/src/header/richheaderstrategy.cpp +++ b/messageviewer/src/header/richheaderstrategy.cpp @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/htmlwriter/filehtmlwriter.h b/messageviewer/src/htmlwriter/filehtmlwriter.h --- a/messageviewer/src/htmlwriter/filehtmlwriter.h +++ b/messageviewer/src/htmlwriter/filehtmlwriter.h @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/htmlwriter/filehtmlwriter.cpp b/messageviewer/src/htmlwriter/filehtmlwriter.cpp --- a/messageviewer/src/htmlwriter/filehtmlwriter.cpp +++ b/messageviewer/src/htmlwriter/filehtmlwriter.cpp @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/htmlwriter/webengineembedpart.h b/messageviewer/src/htmlwriter/webengineembedpart.h --- a/messageviewer/src/htmlwriter/webengineembedpart.h +++ b/messageviewer/src/htmlwriter/webengineembedpart.h @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messageviewer/src/htmlwriter/webengineembedpart.cpp b/messageviewer/src/htmlwriter/webengineembedpart.cpp --- a/messageviewer/src/htmlwriter/webengineembedpart.cpp +++ b/messageviewer/src/htmlwriter/webengineembedpart.cpp @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messageviewer/src/htmlwriter/webengineparthtmlwriter.h b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.h +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.h @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp --- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp +++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp @@ -2,8 +2,9 @@ Copyright (c) 2016-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. + 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/messageviewer/src/interfaces/urlhandler.h b/messageviewer/src/interfaces/urlhandler.h --- a/messageviewer/src/interfaces/urlhandler.h +++ b/messageviewer/src/interfaces/urlhandler.h @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/settings/messageviewersettings.h b/messageviewer/src/settings/messageviewersettings.h --- a/messageviewer/src/settings/messageviewersettings.h +++ b/messageviewer/src/settings/messageviewersettings.h @@ -4,8 +4,9 @@ Copyright (c) 2005 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. + 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/messageviewer/src/settings/messageviewersettings.cpp b/messageviewer/src/settings/messageviewersettings.cpp --- a/messageviewer/src/settings/messageviewersettings.cpp +++ b/messageviewer/src/settings/messageviewersettings.cpp @@ -4,8 +4,9 @@ Copyright (c) 2005 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. + 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/messageviewer/src/viewer/attachmentstrategy.h b/messageviewer/src/viewer/attachmentstrategy.h --- a/messageviewer/src/viewer/attachmentstrategy.h +++ b/messageviewer/src/viewer/attachmentstrategy.h @@ -7,8 +7,9 @@ Copyright (c) 2009 Andras Mantia KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/attachmentstrategy.cpp b/messageviewer/src/viewer/attachmentstrategy.cpp --- a/messageviewer/src/viewer/attachmentstrategy.cpp +++ b/messageviewer/src/viewer/attachmentstrategy.cpp @@ -7,8 +7,9 @@ Copyright (c) 2009 Andras Mantia KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/csshelper.h b/messageviewer/src/viewer/csshelper.h --- a/messageviewer/src/viewer/csshelper.h +++ b/messageviewer/src/viewer/csshelper.h @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/csshelper.cpp b/messageviewer/src/viewer/csshelper.cpp --- a/messageviewer/src/viewer/csshelper.cpp +++ b/messageviewer/src/viewer/csshelper.cpp @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/csshelperbase.h b/messageviewer/src/viewer/csshelperbase.h --- a/messageviewer/src/viewer/csshelperbase.h +++ b/messageviewer/src/viewer/csshelperbase.h @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/csshelperbase.cpp b/messageviewer/src/viewer/csshelperbase.cpp --- a/messageviewer/src/viewer/csshelperbase.cpp +++ b/messageviewer/src/viewer/csshelperbase.cpp @@ -5,8 +5,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/stl_util.h b/messageviewer/src/viewer/stl_util.h --- a/messageviewer/src/viewer/stl_util.h +++ b/messageviewer/src/viewer/stl_util.h @@ -5,8 +5,9 @@ Copyright (c) 2004 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/urlhandlermanager.h b/messageviewer/src/viewer/urlhandlermanager.h --- a/messageviewer/src/viewer/urlhandlermanager.h +++ b/messageviewer/src/viewer/urlhandlermanager.h @@ -7,8 +7,9 @@ Copyright (c) 2009 Andras Mantia KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/viewer/urlhandlermanager.cpp b/messageviewer/src/viewer/urlhandlermanager.cpp --- a/messageviewer/src/viewer/urlhandlermanager.cpp +++ b/messageviewer/src/viewer/urlhandlermanager.cpp @@ -7,8 +7,9 @@ Copyright (c) 2009 Andras Mantia KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/widgets/htmlstatusbar.h b/messageviewer/src/widgets/htmlstatusbar.h --- a/messageviewer/src/widgets/htmlstatusbar.h +++ b/messageviewer/src/widgets/htmlstatusbar.h @@ -6,8 +6,9 @@ Copyright (c) 2003 Marc Mutz KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/widgets/htmlstatusbar.cpp b/messageviewer/src/widgets/htmlstatusbar.cpp --- a/messageviewer/src/widgets/htmlstatusbar.cpp +++ b/messageviewer/src/widgets/htmlstatusbar.cpp @@ -7,8 +7,9 @@ Copyright (C) 2013-2018 Laurent Montel KMail 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. + 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. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h --- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h +++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h @@ -6,8 +6,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail 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. + * 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. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp --- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp +++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp @@ -6,8 +6,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail 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. + * 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. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/messageviewer/src/widgets/printingsettings.h b/messageviewer/src/widgets/printingsettings.h --- a/messageviewer/src/widgets/printingsettings.h +++ b/messageviewer/src/widgets/printingsettings.h @@ -2,8 +2,9 @@ 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. + 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/messageviewer/src/widgets/printingsettings.cpp b/messageviewer/src/widgets/printingsettings.cpp --- a/messageviewer/src/widgets/printingsettings.cpp +++ b/messageviewer/src/widgets/printingsettings.cpp @@ -2,8 +2,9 @@ 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. + 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