21 files changed, 174 insertions, 426 deletions
diff --git a/libshiboken/autodecref.h b/libshiboken/autodecref.h
index 6c9750df..b9c5d29f 100644
--- a/libshiboken/autodecref.h
+++ b/libshiboken/autodecref.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 AUTODECREF_H
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index 304080c9..0e079464 100644
--- a/libshiboken/basewrapper.cpp
+++ b/libshiboken/basewrapper.cpp
@@ -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
  */
 
 #include "basewrapper.h"
diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h
index e65a5b3f..96f9ad82 100644
--- a/libshiboken/basewrapper.h
+++ b/libshiboken/basewrapper.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 BASEWRAPPER_H
diff --git a/libshiboken/basewrapper_p.h b/libshiboken/basewrapper_p.h
index c709bb10..e1a9a0e7 100644
--- a/libshiboken/basewrapper_p.h
+++ b/libshiboken/basewrapper_p.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 BASEWRAPPER_P_H
diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp
index 33e9f3ad..596e7ba0 100644
--- a/libshiboken/bindingmanager.cpp
+++ b/libshiboken/bindingmanager.cpp
@@ -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
  */
 
 #include "basewrapper.h"
diff --git a/libshiboken/bindingmanager.h b/libshiboken/bindingmanager.h
index dd18dcdc..d6985ccc 100644
--- a/libshiboken/bindingmanager.h
+++ b/libshiboken/bindingmanager.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 BINDINGMANAGER_H
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index 1806d63a..142fad00 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.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 CONVERSIONS_H
diff --git a/libshiboken/gilstate.cpp b/libshiboken/gilstate.cpp
index eb44bf32..50a3c6e6 100644
--- a/libshiboken/gilstate.cpp
+++ b/libshiboken/gilstate.cpp
@@ -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
  */
 
 #include "gilstate.h"
@@ -40,10 +28,10 @@ namespace Shiboken
 GilState::GilState()
 {
     if(Py_IsInitialized())
-        m_gstate = PyGILState_Ensure(); 
+        m_gstate = PyGILState_Ensure();
 }
 
-GilState::~GilState() 
+GilState::~GilState()
 {
     if(Py_IsInitialized())
         PyGILState_Release(m_gstate);
diff --git a/libshiboken/gilstate.h b/libshiboken/gilstate.h
index 7045fb31..efb3cb79 100644
--- a/libshiboken/gilstate.h
+++ b/libshiboken/gilstate.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 GILSTATE_H
diff --git a/libshiboken/helper.cpp b/libshiboken/helper.cpp
index 62cbb66a..f61fc144 100644
--- a/libshiboken/helper.cpp
+++ b/libshiboken/helper.cpp
@@ -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
  */
 
 #include "helper.h"
diff --git a/libshiboken/helper.h b/libshiboken/helper.h
index a3a974b9..36340907 100644
--- a/libshiboken/helper.h
+++ b/libshiboken/helper.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 HELPER_H
diff --git a/libshiboken/pyenum.cpp b/libshiboken/pyenum.cpp
index bbd2c278..315f7c61 100644
--- a/libshiboken/pyenum.cpp
+++ b/libshiboken/pyenum.cpp
@@ -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
  */
 
 #include "pyenum.h"
diff --git a/libshiboken/pyenum.h b/libshiboken/pyenum.h
index 1a5bfae5..9c902652 100644
--- a/libshiboken/pyenum.h
+++ b/libshiboken/pyenum.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 SBK_PYENUM_H
diff --git a/libshiboken/python25compat.h b/libshiboken/python25compat.h
index 3cbb8b9b..cbe6b9d2 100644
--- a/libshiboken/python25compat.h
+++ b/libshiboken/python25compat.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 PYTHON25COMPAT_H
diff --git a/libshiboken/sbkdbg.h b/libshiboken/sbkdbg.h
index b3db0227..863ce6de 100644
--- a/libshiboken/sbkdbg.h
+++ b/libshiboken/sbkdbg.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 SBKDBG_H
diff --git a/libshiboken/shiboken.h b/libshiboken/shiboken.h
index 45b0b3f4..83c27b2c 100644
--- a/libshiboken/shiboken.h
+++ b/libshiboken/shiboken.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 SHIBOKEN_H
diff --git a/libshiboken/shibokenmacros.h b/libshiboken/shibokenmacros.h
index bec0f56c..529daac2 100644
--- a/libshiboken/shibokenmacros.h
+++ b/libshiboken/shibokenmacros.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 SHIBOKENMACROS_H
diff --git a/libshiboken/threadstatesaver.cpp b/libshiboken/threadstatesaver.cpp
index c3ffd20e..c5ff19d3 100644
--- a/libshiboken/threadstatesaver.cpp
+++ b/libshiboken/threadstatesaver.cpp
@@ -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
  */
 
 #include "threadstatesaver.h"
@@ -37,7 +25,7 @@
 namespace Shiboken
 {
 
-ThreadStateSaver::ThreadStateSaver() 
+ThreadStateSaver::ThreadStateSaver()
         : m_threadState(0)
     {}
 
diff --git a/libshiboken/threadstatesaver.h b/libshiboken/threadstatesaver.h
index 3629f913..fe2a80e6 100644
--- a/libshiboken/threadstatesaver.h
+++ b/libshiboken/threadstatesaver.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 THREADSTATESAVER_H
diff --git a/libshiboken/typeresolver.cpp b/libshiboken/typeresolver.cpp
index 37b8b017..e69f7f8d 100644
--- a/libshiboken/typeresolver.cpp
+++ b/libshiboken/typeresolver.cpp
@@ -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
  */
 
 #include "typeresolver.h"
diff --git a/libshiboken/typeresolver.h b/libshiboken/typeresolver.h
index a55c0e56..18593551 100644
--- a/libshiboken/typeresolver.h
+++ b/libshiboken/typeresolver.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 TYPERESOLVER_H