From fa74621c218252e8fe33ac7b7bd990466f737d27 Mon Sep 17 00:00:00 2001 From: Rob Scheepmaker Date: Mon, 18 Jan 2010 18:24:57 +0000 Subject: [PATCH] relicense to LGPL v2 svn path=/trunk/KDE/kdelibs/; revision=1076714 --- private/joliemessagehelper_p.h | 7 +++---- private/pinpairingdialog.cpp | 32 ++++++++++++++++---------------- private/pinpairingdialog_p.h | 32 ++++++++++++++++---------------- remote/credentials.cpp | 31 ++++++++++++++++--------------- remote/credentials.h | 31 ++++++++++++++++--------------- 5 files changed, 67 insertions(+), 66 deletions(-) diff --git a/private/joliemessagehelper_p.h b/private/joliemessagehelper_p.h index 9eee0b78d..c1529f415 100644 --- a/private/joliemessagehelper_p.h +++ b/private/joliemessagehelper_p.h @@ -1,10 +1,9 @@ /* - * Copyright 2009 Rob Scheepmaker + * Copyright © 2009 Rob Scheepmaker * * 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, - * or (at your option) any later version. + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation * * 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/private/pinpairingdialog.cpp b/private/pinpairingdialog.cpp index 7160aa772..bd48db7bc 100644 --- a/private/pinpairingdialog.cpp +++ b/private/pinpairingdialog.cpp @@ -1,20 +1,20 @@ /* - Copyright (C) 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * Copyright © 2009 Rob Scheepmaker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "pinpairingdialog_p.h" diff --git a/private/pinpairingdialog_p.h b/private/pinpairingdialog_p.h index bfa66fbe0..095e355bf 100644 --- a/private/pinpairingdialog_p.h +++ b/private/pinpairingdialog_p.h @@ -1,20 +1,20 @@ /* - Copyright (C) 2009 Rob Scheepmaker - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * Copyright © 2009 Rob Scheepmaker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #ifndef PINPAIRINGDIALOG_H #define PINPAIRINGDIALOG_H diff --git a/remote/credentials.cpp b/remote/credentials.cpp index 0225e0cdb..b1efc55f2 100644 --- a/remote/credentials.cpp +++ b/remote/credentials.cpp @@ -1,19 +1,20 @@ /* - Copyright (C) 2009 Rob Scheepmaker - - 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ + * Copyright © 2009 Rob Scheepmaker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "credentials.h" diff --git a/remote/credentials.h b/remote/credentials.h index 392dcafb4..1a12dade0 100644 --- a/remote/credentials.h +++ b/remote/credentials.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2009 Rob Scheepmaker - - 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ + * Copyright © 2009 Rob Scheepmaker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #ifndef CREDENTIALS_H #define CREDENTIALS_H