diff options
-rw-r--r-- | PySide/global.h.in | 19 | ||||
-rw-r--r-- | PySide/qpytextobject.h | 22 | ||||
-rw-r--r-- | doc/pyhtml2devhelp.py | 9 | ||||
-rw-r--r-- | libpyside/autoarraypointer.h | 30 | ||||
-rw-r--r-- | libpyside/dynamicqmetaobject.cpp | 30 | ||||
-rw-r--r-- | libpyside/dynamicqmetaobject.h | 30 | ||||
-rw-r--r-- | libpyside/globalreceiver.cpp | 30 | ||||
-rw-r--r-- | libpyside/globalreceiver.h | 30 | ||||
-rw-r--r-- | libpyside/proxyslot.cpp | 30 | ||||
-rw-r--r-- | libpyside/pyside.cpp | 30 | ||||
-rw-r--r-- | libpyside/pyside.h | 30 | ||||
-rw-r--r-- | libpyside/pysideconversions.h | 28 | ||||
-rw-r--r-- | libpyside/pysidemacros.h | 30 | ||||
-rw-r--r-- | libpyside/qproperty.cpp | 30 | ||||
-rw-r--r-- | libpyside/qproperty.h | 32 | ||||
-rw-r--r-- | libpyside/qsignal.cpp | 30 | ||||
-rw-r--r-- | libpyside/qsignal.h | 30 | ||||
-rw-r--r-- | libpyside/qslot.cpp | 30 | ||||
-rw-r--r-- | libpyside/signalmanager.cpp | 30 | ||||
-rw-r--r-- | libpyside/signalmanager.h | 30 |
20 files changed, 175 insertions, 385 deletions
diff --git a/PySide/global.h.in b/PySide/global.h.in index 7a4c650c6..7266fe1cd 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -5,12 +5,6 @@ ** This file is part of the QtCore module of the Qt Toolkit, plus some ** modifications by PySide team. ** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,19 +13,6 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** diff --git a/PySide/qpytextobject.h b/PySide/qpytextobject.h index 80c5b7ebd..93f246d71 100644 --- a/PySide/qpytextobject.h +++ b/PySide/qpytextobject.h @@ -1,3 +1,25 @@ +/* + * This file is part of the PySide project. + * + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team <contact@pyside.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef QPYTEXTOBJECT #define QPYTEXTOBJECT diff --git a/doc/pyhtml2devhelp.py b/doc/pyhtml2devhelp.py index 895c7e728..60df32986 100644 --- a/doc/pyhtml2devhelp.py +++ b/doc/pyhtml2devhelp.py @@ -10,15 +10,6 @@ Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - As a special exception to the GNU Lesser General Public License - version 2.1, the object code form of a "work that uses the Library" - may incorporate material from a header file that is part of the - Library. You may distribute such object code under terms of your - choice, provided that the incorporated material (i) does not exceed - more than 5% of the total size of the Library; and (ii) is limited to - numerical parameters, data structure layouts, accessors, macros, - inline functions and templates. - 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 diff --git a/libpyside/autoarraypointer.h b/libpyside/autoarraypointer.h index 433401c43..cec7e0cba 100644 --- a/libpyside/autoarraypointer.h +++ b/libpyside/autoarraypointer.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef AUTOARRAYPOINTER_H diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp index 0e545faa0..a779edde6 100644 --- a/libpyside/dynamicqmetaobject.cpp +++ b/libpyside/dynamicqmetaobject.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "dynamicqmetaobject.h" diff --git a/libpyside/dynamicqmetaobject.h b/libpyside/dynamicqmetaobject.h index f8c120b4f..9f66c1f18 100644 --- a/libpyside/dynamicqmetaobject.h +++ b/libpyside/dynamicqmetaobject.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DYNAMICQMETAOBJECT_H diff --git a/libpyside/globalreceiver.cpp b/libpyside/globalreceiver.cpp index e37235d5e..e3dcf1111 100644 --- a/libpyside/globalreceiver.cpp +++ b/libpyside/globalreceiver.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "globalreceiver.h" diff --git a/libpyside/globalreceiver.h b/libpyside/globalreceiver.h index 605003603..1e67fdee3 100644 --- a/libpyside/globalreceiver.h +++ b/libpyside/globalreceiver.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef GLOBALRECEIVER_H diff --git a/libpyside/proxyslot.cpp b/libpyside/proxyslot.cpp index 885232574..285f88ba1 100644 --- a/libpyside/proxyslot.cpp +++ b/libpyside/proxyslot.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <Python.h> diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp index 744dfee3a..a5996a45d 100644 --- a/libpyside/pyside.cpp +++ b/libpyside/pyside.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libpyside/pyside.h b/libpyside/pyside.h index 52aeec17e..5c5dc2e0a 100644 --- a/libpyside/pyside.h +++ b/libpyside/pyside.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PYSIDE_H diff --git a/libpyside/pysideconversions.h b/libpyside/pysideconversions.h index 35fa687df..f36496d46 100644 --- a/libpyside/pysideconversions.h +++ b/libpyside/pysideconversions.h @@ -5,31 +5,19 @@ * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PYSIDECONVERSIONS_H diff --git a/libpyside/pysidemacros.h b/libpyside/pysidemacros.h index ccf8e379a..fe475a3fb 100644 --- a/libpyside/pysidemacros.h +++ b/libpyside/pysidemacros.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PYSIDEMACROS_H diff --git a/libpyside/qproperty.cpp b/libpyside/qproperty.cpp index c4b728ac5..7f28923a1 100644 --- a/libpyside/qproperty.cpp +++ b/libpyside/qproperty.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <shiboken.h> diff --git a/libpyside/qproperty.h b/libpyside/qproperty.h index f561d47b7..a06d5ade3 100644 --- a/libpyside/qproperty.h +++ b/libpyside/qproperty.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PYSIDE_PROPERTY_H diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp index 01daec68b..d5e93cf88 100644 --- a/libpyside/qsignal.cpp +++ b/libpyside/qsignal.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <shiboken.h> diff --git a/libpyside/qsignal.h b/libpyside/qsignal.h index f57ac2498..2776d35bf 100644 --- a/libpyside/qsignal.h +++ b/libpyside/qsignal.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PYSIDE_SIGNAL_H diff --git a/libpyside/qslot.cpp b/libpyside/qslot.cpp index c471cbb30..bdb9c1a44 100644 --- a/libpyside/qslot.cpp +++ b/libpyside/qslot.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. Please - * review the following information to ensure the GNU Lesser General - * Public License version 2.1 requirements will be met: - * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * As a special exception to the GNU Lesser General Public License - * version 2.1, the object code form of a "work that uses the Library" - * may incorporate material from a header file that is part of the - * Library. You may distribute such object code under terms of your - * choice, provided that the incorporated material (i) does not exceed - * more than 5% of the total size of the Library; and (ii) is limited to - * numerical parameters, data structure layouts, accessors, macros, - * inline functions and templates. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <shiboken.h> diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp index ed1573207..de0882948 100644 --- a/libpyside/signalmanager.cpp +++ b/libpyside/signalmanager.cpp @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "signalmanager.h" diff --git a/libpyside/signalmanager.h b/libpyside/signalmanager.h index 08160a5a1..4c1c50077 100644 --- a/libpyside/signalmanager.h +++ b/libpyside/signalmanager.h @@ -1,35 +1,23 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * -* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public License -* version 2.1 as published by the Free Software Foundation. Please -* review the following information to ensure the GNU Lesser General -* Public License version 2.1 requirements will be met: -* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. * -* As a special exception to the GNU Lesser General Public License -* version 2.1, the object code form of a "work that uses the Library" -* may incorporate material from a header file that is part of the -* Library. You may distribute such object code under terms of your -* choice, provided that the incorporated material (i) does not exceed -* more than 5% of the total size of the Library; and (ii) is limited to -* numerical parameters, data structure layouts, accessors, macros, -* inline functions and templates. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SIGNALMANAGER_H |