From 40210ad407f4ea37d648af38298290e5be048d25 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 16 Dec 2007 15:37:21 +0000 Subject: [PATCH] RELICENSE: GPLv2->GPLv23 svn path=/trunk/KDE/kdebase/apps/; revision=749122 --- keditbookmarks/bookmarkinfo.h | 13 ++++++------- keditbookmarks/bookmarkiterator.h | 13 ++++++------- keditbookmarks/bookmarklistview.cpp | 13 ++++++------- keditbookmarks/bookmarkmodel.h | 13 ++++++------- keditbookmarks/commands.h | 13 ++++++------- keditbookmarks/exporters.cpp | 13 ++++++------- keditbookmarks/exporters.h | 13 ++++++------- keditbookmarks/favicons.h | 13 ++++++------- keditbookmarks/importers.h | 13 ++++++------- keditbookmarks/kebsearchline.h | 13 ++++++------- keditbookmarks/testlink.h | 13 ++++++------- keditbookmarks/toplevel.h | 13 ++++++------- keditbookmarks/treeitem.cpp | 13 ++++++------- keditbookmarks/treeitem_p.h | 13 ++++++------- keditbookmarks/updater.h | 13 ++++++------- 15 files changed, 90 insertions(+), 105 deletions(-) diff --git a/keditbookmarks/bookmarkinfo.h b/keditbookmarks/bookmarkinfo.h index 65254350c7..5a4456b7d7 100644 --- a/keditbookmarks/bookmarkinfo.h +++ b/keditbookmarks/bookmarkinfo.h @@ -4,18 +4,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __bookmarkinfo_h diff --git a/keditbookmarks/bookmarkiterator.h b/keditbookmarks/bookmarkiterator.h index 23a366b8d2..a1cacc50e5 100644 --- a/keditbookmarks/bookmarkiterator.h +++ b/keditbookmarks/bookmarkiterator.h @@ -3,18 +3,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __bookmarkiterator_h diff --git a/keditbookmarks/bookmarklistview.cpp b/keditbookmarks/bookmarklistview.cpp index a8818f62c8..6be57c0251 100644 --- a/keditbookmarks/bookmarklistview.cpp +++ b/keditbookmarks/bookmarklistview.cpp @@ -4,18 +4,17 @@ Copyright (C) 2005 Daniel Teske 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #include "bookmarklistview.h" diff --git a/keditbookmarks/bookmarkmodel.h b/keditbookmarks/bookmarkmodel.h index 26acb35802..12a11dfad5 100644 --- a/keditbookmarks/bookmarkmodel.h +++ b/keditbookmarks/bookmarkmodel.h @@ -2,18 +2,17 @@ Copyright (C) 2005 Daniel Teske 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __bookmarkmodel_h diff --git a/keditbookmarks/commands.h b/keditbookmarks/commands.h index b81c0bf96d..2a27c30206 100644 --- a/keditbookmarks/commands.h +++ b/keditbookmarks/commands.h @@ -4,18 +4,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __commands_h diff --git a/keditbookmarks/exporters.cpp b/keditbookmarks/exporters.cpp index 5af47b38d2..b401320c04 100644 --- a/keditbookmarks/exporters.cpp +++ b/keditbookmarks/exporters.cpp @@ -4,18 +4,17 @@ Copyright (C) 2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #include "exporters.h" diff --git a/keditbookmarks/exporters.h b/keditbookmarks/exporters.h index 06ee981d88..e7e5fa9923 100644 --- a/keditbookmarks/exporters.h +++ b/keditbookmarks/exporters.h @@ -2,18 +2,17 @@ Copyright (C) 2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __exporters_h diff --git a/keditbookmarks/favicons.h b/keditbookmarks/favicons.h index c69786bf69..8a5ac0a159 100644 --- a/keditbookmarks/favicons.h +++ b/keditbookmarks/favicons.h @@ -4,18 +4,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __favicons_h diff --git a/keditbookmarks/importers.h b/keditbookmarks/importers.h index c9bb42222f..7c07c61b36 100644 --- a/keditbookmarks/importers.h +++ b/keditbookmarks/importers.h @@ -4,18 +4,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __importers_h diff --git a/keditbookmarks/kebsearchline.h b/keditbookmarks/kebsearchline.h index af463df1a0..849afb2efe 100644 --- a/keditbookmarks/kebsearchline.h +++ b/keditbookmarks/kebsearchline.h @@ -2,18 +2,17 @@ Copyright (C) 2005 Daniel Teske 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __kebsearchline_h diff --git a/keditbookmarks/testlink.h b/keditbookmarks/testlink.h index 27e31ed19f..f42023c1f3 100644 --- a/keditbookmarks/testlink.h +++ b/keditbookmarks/testlink.h @@ -3,18 +3,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __testlink_h diff --git a/keditbookmarks/toplevel.h b/keditbookmarks/toplevel.h index b78aeadc79..fd75ac3824 100644 --- a/keditbookmarks/toplevel.h +++ b/keditbookmarks/toplevel.h @@ -3,18 +3,17 @@ Copyright (C) 2002-2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __toplevel_h diff --git a/keditbookmarks/treeitem.cpp b/keditbookmarks/treeitem.cpp index ebd702adfe..844c12dd70 100644 --- a/keditbookmarks/treeitem.cpp +++ b/keditbookmarks/treeitem.cpp @@ -2,18 +2,17 @@ Copyright (C) 2005 Daniel Teske 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #include "treeitem_p.h" diff --git a/keditbookmarks/treeitem_p.h b/keditbookmarks/treeitem_p.h index c0bc34d676..d1b0358bb0 100644 --- a/keditbookmarks/treeitem_p.h +++ b/keditbookmarks/treeitem_p.h @@ -2,18 +2,17 @@ Copyright (C) 2005 Daniel Teske 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __treeitem_h diff --git a/keditbookmarks/updater.h b/keditbookmarks/updater.h index d0e8bd6638..71b2aa0416 100644 --- a/keditbookmarks/updater.h +++ b/keditbookmarks/updater.h @@ -4,18 +4,17 @@ Copyright (C) 2003 Alexander Kellett 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. + 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) version 3. 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. + 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; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with this program. If not, see */ #ifndef __updater_h