Adapt to API changes in libshiboken.

15 files changed, 75 insertions, 75 deletions

diff --git a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
index 19ee4e7b6..03ffcb4af 100644
--- a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
+++ b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
@@ -15,10 +15,10 @@ static Py_ssize_t SbkQByteArray_segcountproc(PyObject* self, Py_ssize_t* lenp)
 
 static Py_ssize_t SbkQByteArray_readbufferproc(PyObject* self, Py_ssize_t segment, void** ptrptr)
 {
-    if (segment || !Shiboken::Wrapper::isValid(self))
+    if (segment || !Shiboken::Object::isValid(self))
         return -1;
 
-    QByteArray* cppSelf = Converter<QByteArray*>::toCpp(self);
+    QByteArray* cppSelf = Shiboken::Converter<QByteArray*>::toCpp(self);
     *ptrptr = reinterpret_cast<void*>(cppSelf->data());
     return cppSelf->size();
 }
diff --git a/PySide/QtCore/glue/qcoreapplication_init.cpp b/PySide/QtCore/glue/qcoreapplication_init.cpp
index 446074c67..0c0e1f8fe 100644
--- a/PySide/QtCore/glue/qcoreapplication_init.cpp
+++ b/PySide/QtCore/glue/qcoreapplication_init.cpp
@@ -4,7 +4,7 @@ static char** QCoreApplicationArgValues;
 
 int Sbk_QCoreApplication_Init(PyObject* self, PyObject* args, PyObject*)
 {
-    if (Shiboken::Wrapper::isUserType(self) && !Shiboken::BaseType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >()))
+    if (Shiboken::Object::isUserType(self) && !Shiboken::ObjectType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >()))
         return -1;
 
 
@@ -26,13 +26,13 @@ int Sbk_QCoreApplication_Init(PyObject* self, PyObject* args, PyObject*)
 
     SbkObject* sbkSelf = reinterpret_cast<SbkObject*>(self);
     QCoreApplicationWrapper* cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues);
-    Shiboken::Wrapper::setCppPointer(sbkSelf,
+    Shiboken::Object::setCppPointer(sbkSelf,
                                      Shiboken::SbkType<QCoreApplication>(),
                                      cptr);
 
-    Shiboken::Wrapper::setValidCpp(sbkSelf, true);
-    Shiboken::Wrapper::setHasCppWrapper(sbkSelf, true);
-    Shiboken::Wrapper::releaseOwnership(sbkSelf);
+    Shiboken::Object::setValidCpp(sbkSelf, true);
+    Shiboken::Object::setHasCppWrapper(sbkSelf, true);
+    Shiboken::Object::releaseOwnership(sbkSelf);
 
     Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr);
     PySide::Signal::updateSourceObject(self);
diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index dea4440a5..91c830abd 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -3,11 +3,11 @@ static bool getReceiver(PyObject* callback, QObject** receiver, PyObject** self)
     if (PyMethod_Check(callback)) {
         *self = PyMethod_GET_SELF(callback);
         if (Shiboken::Converter<QObject*>::checkType(*self))
-            *receiver = Converter<QObject*>::toCpp(*self);
+            *receiver = Shiboken::Converter<QObject*>::toCpp(*self);
     } else if (PyCFunction_Check(callback)) {
         *self = PyCFunction_GET_SELF(callback);
         if (*self && Shiboken::Converter<QObject*>::checkType(*self))
-            *receiver = Converter<QObject*>::toCpp(*self);
+            *receiver = Shiboken::Converter<QObject*>::toCpp(*self);
     } else if (PyCallable_Check(callback)) {
         // Ok, just a callable object
         *receiver = 0;
@@ -66,7 +66,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
     const char* slot = callbackSig.constData();
     int slotIndex = metaObject->indexOfSlot(slot);
     if (slotIndex == -1) {
-        if (!usingGlobalReceiver && self && !Shiboken::Wrapper::hasCppWrapper((SbkObject*)self)) {
+        if (!usingGlobalReceiver && self && !Shiboken::Object::hasCppWrapper((SbkObject*)self)) {
             qWarning() << "You can't add dynamic slots on an object originated from C++.";
             return false;
         }
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
index bfff5651f..68b6e8f5a 100644
--- a/PySide/QtCore/qvariant_conversions.h
+++ b/PySide/QtCore/qvariant_conversions.h
@@ -16,13 +16,13 @@ struct Converter<QVariant>
 
     static QByteArray resolveMetaType(PyTypeObject* type, int &typeId)
     {
-        if (PyObject_TypeCheck(type, &SbkBaseType_Type)) {
-            SbkBaseType* sbkType = reinterpret_cast<SbkBaseType*>(type);
-            QByteArray typeName(Shiboken::BaseType::getOriginalName(sbkType));
+        if (PyObject_TypeCheck(type, &SbkObjectType_Type)) {
+            SbkObjectType* sbkType = reinterpret_cast<SbkObjectType*>(type);
+            QByteArray typeName(Shiboken::ObjectType::getOriginalName(sbkType));
             bool valueType = !typeName.endsWith("*");
 
             // Do not convert user type of value
-            if (valueType && Shiboken::BaseType::isUserType(type))
+            if (valueType && Shiboken::ObjectType::isUserType(type))
                 return QByteArray();
 
             int obTypeId = QMetaType::type(typeName);
@@ -86,8 +86,8 @@ struct Converter<QVariant>
             return convertToVariantList(pyObj);
         } else {
             // a class supported by QVariant?
-            if (Shiboken::Wrapper::checkType(pyObj)) {
-                SbkBaseType* objType = reinterpret_cast<SbkBaseType*>(pyObj->ob_type);
+            if (Shiboken::Object::checkType(pyObj)) {
+                SbkObjectType* objType = reinterpret_cast<SbkObjectType*>(pyObj->ob_type);
                 int typeCode = 0;
                 QByteArray typeName = resolveMetaType(reinterpret_cast<PyTypeObject*>(objType), typeCode);
                 if (typeCode) {
diff --git a/PySide/QtCore/qvariant_type_conversions.h b/PySide/QtCore/qvariant_type_conversions.h
index 74b3289d1..bacf6c070 100644
--- a/PySide/QtCore/qvariant_type_conversions.h
+++ b/PySide/QtCore/qvariant_type_conversions.h
@@ -26,8 +26,8 @@ struct Converter<QVariant::Type>
         else if (pyObj == reinterpret_cast<PyObject*>(&PyLong_Type))
             typeName = "int"; // long is a UserType in QVariant.
         else if (PyType_Check(pyObj)) {
-            if (pyObj->ob_type == &SbkBaseType_Type)
-                typeName = Shiboken::BaseType::getOriginalName(reinterpret_cast<SbkBaseType*>(pyObj));
+            if (pyObj->ob_type == &SbkObjectType_Type)
+                typeName = Shiboken::ObjectType::getOriginalName(reinterpret_cast<SbkObjectType*>(pyObj));
             else
                 typeName = reinterpret_cast<PyTypeObject*>(pyObj)->tp_name;
         }
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 83fd2ed81..22c6be317 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1931,7 +1931,7 @@
         PyObject* pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
         Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
 
-        QTimer* timer = Converter&lt;QTimer*>::toCpp(pyTimer);
+        QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer);
         Shiboken::AutoDecRef result(
             PyObject_CallMethod(pyTimer,
                                 const_cast&lt;char*>("connect"),
@@ -1941,7 +1941,7 @@
                                 %PYARG_2,
                                 %3)
         );
-        Shiboken::Wrapper::invalidate((SbkObject*)pyTimer);
+        Shiboken::Object::invalidate((SbkObject*)pyTimer);
         timer->setSingleShot(true);
         timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
         timer->start(%1);
@@ -1953,7 +1953,7 @@
         Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
         PyObject *pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
         Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
-        QTimer* timer = Converter&lt;QTimer*>::toCpp(pyTimer);
+        QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer);
         timer->setSingleShot(true);
         timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
 
@@ -1979,7 +1979,7 @@
                                     pyargs[1])
             );
         }
-        Shiboken::Wrapper::invalidate((SbkObject*)pyTimer);
+        Shiboken::Object::invalidate((SbkObject*)pyTimer);
         timer->start(%1);
         </inject-code>
     </add-function>
@@ -2567,7 +2567,7 @@
         <inject-code class="target" position="beginning">
             for(int counter = 0; counter &lt; %CPPSELF.animationCount(); ++counter ) {
                     PyObject* obj = %CONVERTTOPYTHON[QAbstractAnimation*](%CPPSELF.animationAt(counter));
-                    Shiboken::Wrapper::setParent(NULL, obj);
+                    Shiboken::Object::setParent(NULL, obj);
                     Py_DECREF(obj);
             }
             %CPPSELF.clear();
@@ -2721,7 +2721,7 @@
             %PYARG_0 = PySet_New(0);
             foreach(QAbstractState* abs_state, %CPPSELF.configuration()) {
                     Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractState*](abs_state));
-                    Shiboken::Wrapper::setParent(self, obj);
+                    Shiboken::Object::setParent(self, obj);
                     PySet_Add(%PYARG_0, obj);
             }
         </inject-code>
@@ -2732,7 +2732,7 @@
             %PYARG_0 = PyList_New(0);
             foreach(QAbstractAnimation* abs_anim, %CPPSELF.defaultAnimations()) {
                     Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractAnimation*](abs_anim));
-                    Shiboken::Wrapper::setParent(self, obj);
+                    Shiboken::Object::setParent(self, obj);
                     PyList_Append(%PYARG_0, obj);
             }
         </inject-code>
diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp
index b4bf32491..581e4dadf 100644
--- a/PySide/QtGui/glue/qapplication_init.cpp
+++ b/PySide/QtGui/glue/qapplication_init.cpp
@@ -7,7 +7,7 @@ static const char QAPP_MACRO[] = "qApp";
 
 int Sbk_QApplication_Init(PyObject* self, PyObject* args, PyObject*)
 {
-    if (Shiboken::Wrapper::isUserType(self) && !Shiboken::BaseType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication>()))
+    if (Shiboken::Object::isUserType(self) && !Shiboken::ObjectType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication>()))
         return -1;
 
     if (QApplication::instance()) {
@@ -28,12 +28,12 @@ int Sbk_QApplication_Init(PyObject* self, PyObject* args, PyObject*)
 
     SbkObject* sbkSelf = reinterpret_cast<SbkObject*>(self);
     QApplicationWrapper* cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues);
-    Shiboken::Wrapper::setCppPointer(sbkSelf,
+    Shiboken::Object::setCppPointer(sbkSelf,
                                      Shiboken::SbkType<QApplication>(),
                                      cptr);
-    Shiboken::Wrapper::setValidCpp(sbkSelf, true);
-    Shiboken::Wrapper::setHasCppWrapper(sbkSelf, true);
-    Shiboken::Wrapper::releaseOwnership(sbkSelf);
+    Shiboken::Object::setValidCpp(sbkSelf, true);
+    Shiboken::Object::setHasCppWrapper(sbkSelf, true);
+    Shiboken::Object::releaseOwnership(sbkSelf);
     Shiboken::BindingManager::instance().registerWrapper(sbkSelf, cptr);
     PySide::Signal::updateSourceObject(self);
     cptr->metaObject();
diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h
index 3361e618a..b0e8a0e5d 100644
--- a/PySide/QtGui/glue/qlayout_help_functions.h
+++ b/PySide/QtGui/glue/qlayout_help_functions.h
@@ -18,11 +18,11 @@ inline void addLayoutOwnership(QLayout* layout, QWidget* widget)
         //keep the reference while the layout is orphan
         Shiboken::AutoDecRef pyParent(Shiboken::Converter<QWidget*>::toPython(layout));
         Shiboken::AutoDecRef pyChild(Shiboken::Converter<QWidget*>::toPython(widget));
-        Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
+        Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
     } else {
         Shiboken::AutoDecRef pyParent(Shiboken::Converter<QWidget*>::toPython(parent));
         Shiboken::AutoDecRef pyChild(Shiboken::Converter<QWidget*>::toPython(widget));
-        Shiboken::Wrapper::setParent(pyParent, pyChild);
+        Shiboken::Object::setParent(pyParent, pyChild);
     }
 }
 
@@ -34,7 +34,7 @@ inline void addLayoutOwnership(QLayout* layout, QLayout* other)
         //keep the reference while the layout is orphan
         Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));
         Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(other));
-        Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
+        Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
         return;
     }
 
@@ -48,7 +48,7 @@ inline void addLayoutOwnership(QLayout* layout, QLayout* other)
 
     Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));
     Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(other));
-    Shiboken::Wrapper::setParent(pyParent, pyChild);
+    Shiboken::Object::setParent(pyParent, pyChild);
 
 }
 
@@ -65,7 +65,7 @@ inline void addLayoutOwnership(QLayout* layout, QLayoutItem* item)
 
     Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));
     Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayoutItem*>::toPython(item));
-    Shiboken::Wrapper::setParent(pyParent, pyChild);
+    Shiboken::Object::setParent(pyParent, pyChild);
 }
 
 #endif
diff --git a/PySide/QtGui/glue/qwidget_glue.h b/PySide/QtGui/glue/qwidget_glue.h
index 469868877..9b20cb5ba 100644
--- a/PySide/QtGui/glue/qwidget_glue.h
+++ b/PySide/QtGui/glue/qwidget_glue.h
@@ -22,7 +22,7 @@ static inline void qwidgetReparentLayout(QWidget *parent, QLayout *layout)
             QWidget* pw = w->parentWidget();
             if (pw != parent) {
                 Shiboken::AutoDecRef pyChild(Shiboken::Converter<QWidget*>::toPython(w));
-                Shiboken::Wrapper::setParent(pyParent, pyChild);
+                Shiboken::Object::setParent(pyParent, pyChild);
             }
         } else {
             QLayout* l = item->layout();
@@ -32,9 +32,9 @@ static inline void qwidgetReparentLayout(QWidget *parent, QLayout *layout)
     }
 
     Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(layout));
-    Shiboken::Wrapper::setParent(pyParent, pyChild);
+    Shiboken::Object::setParent(pyParent, pyChild);
     //remove previous references
-    Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(pyChild.object()), qPrintable(retrieveObjectName(pyChild)), Py_None);
+    Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyChild.object()), qPrintable(retrieveObjectName(pyChild)), Py_None);
 }
 
 static inline void qwidgetSetLayout(QWidget *self, QLayout *layout)
@@ -47,7 +47,7 @@ static inline void qwidgetSetLayout(QWidget *self, QLayout *layout)
         if (oldParent->isWidgetType()) {
             // remove old parent policy
             Shiboken::AutoDecRef pyLayout(Shiboken::Converter<QLayout*>::toPython(layout));
-            Shiboken::Wrapper::setParent(Py_None, pyLayout);
+            Shiboken::Object::setParent(Py_None, pyLayout);
         } else {
             PyErr_Format(PyExc_RuntimeError, "QWidget::setLayout: Attempting to set QLayout \"%s\" on %s \"%s\", when the QLayout already has a parent",
                           qPrintable(layout->objectName()), self->metaObject()->className(), qPrintable(self->objectName()));
diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h
index f6a2e58eb..fc49af6be 100644
--- a/PySide/QtGui/qpixmap_conversion.h
+++ b/PySide/QtGui/qpixmap_conversion.h
@@ -8,15 +8,15 @@ inline bool Converter<QPixmap>::isConvertible(PyObject* pyobj)
 {
     if (ValueTypeConverter<QPixmap>::isConvertible(pyobj))
         return true;
-    SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<QPixmap>());
-    bool isVariant = Converter<QVariant>::checkType(pyobj);
+    SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>());
+    bool isVariant = Shiboken::Converter<QVariant>::checkType(pyobj);
     if (isVariant) {
-        QVariant var(Converter<QVariant>::toCpp(pyobj));
+        QVariant var(Shiboken::Converter<QVariant>::toCpp(pyobj));
         return var.type() == QVariant::Pixmap;
-    } else if (Converter<QSize>::checkType(pyobj) || Converter<QString>::checkType(pyobj)) {
+    } else if (Shiboken::Converter<QSize>::checkType(pyobj) || Shiboken::Converter<QString>::checkType(pyobj)) {
         return true;
     } else {
-        return Shiboken::BaseType::isExternalConvertible(shiboType, pyobj);
+        return Shiboken::ObjectType::isExternalConvertible(shiboType, pyobj);
     }
     return false;
 
@@ -24,7 +24,7 @@ inline bool Converter<QPixmap>::isConvertible(PyObject* pyobj)
 
 inline QPixmap Converter<QPixmap>::toCpp(PyObject* pyobj)
 {
-    SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<QPixmap>());
+    SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>());
     bool isVariant = Converter<QVariant>::checkType(pyobj);
     if (isVariant) {
         QVariant var(Converter<QVariant>::toCpp(pyobj));
@@ -33,8 +33,8 @@ inline QPixmap Converter<QPixmap>::toCpp(PyObject* pyobj)
         return QPixmap(Shiboken::Converter<QSize >::toCpp(pyobj));
     } else if (Converter<QString>::checkType(pyobj)) {
         return QPixmap(Shiboken::Converter<QString >::toCpp(pyobj));
-    } else if (Shiboken::BaseType::isExternalConvertible(shiboType, pyobj) && Shiboken::BaseType::hasExternalCppConversions(shiboType)) {
-        QPixmap* cptr = reinterpret_cast<QPixmap*>(Shiboken::BaseType::callExternalCppConversion(shiboType, pyobj));
+    } else if (Shiboken::ObjectType::isExternalConvertible(shiboType, pyobj) && Shiboken::ObjectType::hasExternalCppConversions(shiboType)) {
+        QPixmap* cptr = reinterpret_cast<QPixmap*>(Shiboken::ObjectType::callExternalCppConversion(shiboType, pyobj));
         std::auto_ptr<QPixmap> cptr_auto_ptr(cptr);
         return *cptr;
     }
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index d9f75745b..a5f22d835 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -526,7 +526,7 @@
     <add-function signature="value()" return-type="QTreeWidgetItem*">
         <inject-code>
             %PYARG_0 = %CONVERTTOPYTHON[QTreeWidgetItem*](%CPPSELF.operator*());
-            Shiboken::Wrapper::releaseOwnership(%PYARG_0);
+            Shiboken::Object::releaseOwnership(%PYARG_0);
         </inject-code>
     </add-function>
     <enum-type name="IteratorFlag" flags="QTreeWidgetItemIterator::IteratorFlags"/>
@@ -1621,7 +1621,7 @@
         <reference-count action="add"/>
       </modify-argument>
       <inject-code>
-        Shiboken::Wrapper::releaseOwnership(%PYARG_2);
+        Shiboken::Object::releaseOwnership(%PYARG_2);
       </inject-code>
     </modify-function>
     <modify-function signature="setDefaultFactory(QItemEditorFactory *)">
@@ -1955,7 +1955,7 @@
       <inject-code class="target" position="end">
         Shiboken::AutoDecRef result(PyObject_CallMethod(%PYSELF, "connect", "OsO", %PYSELF, SIGNAL(activated()), %PYARG_3));
         if (!result.isNull())
-            Shiboken::Wrapper::setParent(%PYARG_2, %PYSELF);
+            Shiboken::Object::setParent(%PYARG_2, %PYSELF);
       </inject-code>
     </add-function>
   </object-type>
@@ -2018,7 +2018,7 @@
         QStandardItem* _i = %CPPSELF->child(%1, %2);
         if (_i) {
             PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
-            Shiboken::Wrapper::setParent(0, _pyI);
+            Shiboken::Object::setParent(0, _pyI);
         }
       </inject-code>
       <modify-argument index="3">
@@ -2031,7 +2031,7 @@
         QStandardItem* _i = %CPPSELF->child(%1);
         if (_i) {
             PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
-            Shiboken::Wrapper::setParent(0, _pyI);
+            Shiboken::Object::setParent(0, _pyI);
         }
       </inject-code>
       <modify-argument index="2">
@@ -2170,7 +2170,7 @@
         QWidget *_widget = %CPPSELF.widget(%1);
         if (_widget) {
             Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](_widget));
-            Shiboken::Wrapper::setParent(0, pyWidget);
+            Shiboken::Object::setParent(0, pyWidget);
         }
       </inject-code>
     </modify-function>
@@ -3317,7 +3317,7 @@
 
     <modify-function signature="setStyle(QStyle*)">
       <inject-code class="target" position="end">
-        Shiboken::Wrapper::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_1);
+        Shiboken::Object::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_1);
       </inject-code>
     </modify-function>
     <modify-function signature="style()const">
@@ -3328,10 +3328,10 @@
             QStyle *appStyle = qApp->style();
             if (appStyle == myStyle) {
                 Shiboken::AutoDecRef pyApp(%CONVERTTOPYTHON[QApplication*](qApp));
-                Shiboken::Wrapper::setParent(pyApp, %PYARG_0);
-                Shiboken::Wrapper::releaseOwnership(%PYARG_0);
+                Shiboken::Object::setParent(pyApp, %PYARG_0);
+                Shiboken::Object::releaseOwnership(%PYARG_0);
             } else {
-                Shiboken::Wrapper::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_0);
+                Shiboken::Object::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_0);
             }
         }
       </inject-code>
@@ -3586,7 +3586,7 @@
         QWidget* tab = %CPPSELF.widget(%1);
         if (tab) {
             Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](tab));
-            Shiboken::Wrapper::setParent(0, pyWidget);
+            Shiboken::Object::setParent(0, pyWidget);
             %CPPSELF.%FUNCTION_NAME(%1);
         }
     </inject-code>
@@ -3595,7 +3595,7 @@
         <inject-code class="target" position="beginning">
             for (int i=0; i &lt; %CPPSELF.count(); i++) {
             	Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](%CPPSELF.widget(i)));
-                Shiboken::Wrapper::setParent(0, pyWidget);
+                Shiboken::Object::setParent(0, pyWidget);
             }
             %CPPSELF.%FUNCTION_NAME();
         </inject-code>
@@ -3853,7 +3853,7 @@
         QStandardItem* _i = %CPPSELF->item(%1, %2);
         if (_i) {
             PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
-            Shiboken::Wrapper::setParent(0, _pyI);
+            Shiboken::Object::setParent(0, _pyI);
         }
       </inject-code>
       <modify-argument index="3">
@@ -3866,7 +3866,7 @@
         QStandardItem* _i = %CPPSELF->item(%1);
         if (_i) {
             PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
-            Shiboken::Wrapper::setParent(0, _pyI);
+            Shiboken::Object::setParent(0, _pyI);
         }
       </inject-code>
       <modify-argument index="2">
@@ -3885,7 +3885,7 @@
         QStandardItem* _i = %CPPSELF->verticalHeaderItem(%1);
         if (_i) {
             PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
-            Shiboken::Wrapper::setParent(0, _pyI);
+            Shiboken::Object::setParent(0, _pyI);
         }
       </inject-code>
       <modify-argument index="2">
@@ -3935,7 +3935,7 @@
             QList&lt;QStandardItem *&gt; ri = %CPPSELF.takeRow(0);
 
             PyObject *pyResult = %CONVERTTOPYTHON[QList&lt;QStandardItem * &gt;](ri);
-            Shiboken::Wrapper::setParent(Py_None, pyResult);
+            Shiboken::Object::setParent(Py_None, pyResult);
             Py_XDECREF(pyResult);
           }
         </inject-code>
@@ -4554,7 +4554,7 @@
     <!-- ownership control transfer to qApp -->
     <modify-function signature="setStyle(QStyle*)">
         <inject-code class="target" position="end">
-            Shiboken::Wrapper::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_1);
+            Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_1);
         </inject-code>
     </modify-function>
     <modify-function signature="style()">
diff --git a/PySide/QtUiTools/glue/uitools_loadui.h b/PySide/QtUiTools/glue/uitools_loadui.h
index 302c3e72b..a6e339ab0 100644
--- a/PySide/QtUiTools/glue/uitools_loadui.h
+++ b/PySide/QtUiTools/glue/uitools_loadui.h
@@ -20,7 +20,7 @@ _populate_parent(PyObject* pyParent, QObject *parent)
             if (!has_attr)
                 PyObject_SetAttrString(pyParent, qPrintable(name), pyChild);
 
-            Shiboken::Wrapper::setParent(pyParent, pyChild);
+            Shiboken::Object::setParent(pyParent, pyChild);
             _populate_parent(pyChild, qobject_cast<QObject*>(child));
         }
     }
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index 9ec7c7569..da709a437 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -40,8 +40,8 @@
         </modify-argument>
         <inject-code position="end">
             SbkObject* _pyReturn = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);
-            if (!Shiboken::Wrapper::hasParentInfo(_pyReturn))
-                Shiboken::Wrapper::setParent(%PYSELF, %PYARG_0);
+            if (!Shiboken::Object::hasParentInfo(_pyReturn))
+                Shiboken::Object::setParent(%PYSELF, %PYARG_0);
         </inject-code>
     </modify-function>
     <modify-function signature="print(QPrinter*)const" rename="print_" />
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index 1dd8dd3f8..d018ee5e0 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -290,8 +290,8 @@
     <object-type name="QXmlLexicalHandler"/>
 
     <template name="QXmlEntityResolver_resolveEntity_return_conversion_native">
-        AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0));
-        AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1));
+        Shiboken::AutoDecRef  _py_ok_(PySequence_GetItem(%PYARG_0, 0));
+        Shiboken::AutoDecRef  _py_ret_(PySequence_GetItem(%PYARG_0, 1));
         %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ok_);
         %3 = %CONVERTTOCPP[QXmlInputSource*](_py_ret_);
     </template>
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 6bc814d17..9d39bb481 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -23,9 +23,9 @@
         $CHILD_TYPE* oldChild = %CPPSELF.$FUNCTION_GET_OLD();
         if (oldChild) {
             Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[$CHILD_TYPE*](oldChild));
-            Shiboken::Wrapper::setParent(NULL, pyChild);
+            Shiboken::Object::setParent(NULL, pyChild);
         }
-        Shiboken::Wrapper::setParent(%PYSELF, $PYARG);
+        Shiboken::Object::setParent(%PYSELF, $PYARG);
     </template>
 
     <!-- Templates to fix bool* parameters -->
@@ -155,8 +155,8 @@
     </template>
 
     <template name="fix_virtual_method_return_value_and_bool*">
-        AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 0));
-        AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 1));
+        Shiboken::AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 0));
+        Shiboken::AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 1));
         %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ret_);
         *%2 = %CONVERTTOCPP[bool](_py_ok_);
     </template>
@@ -183,8 +183,8 @@
     </template>
    <template name="set_qapp_parent_for_orphan">
         SbkObject* _pySelf = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);
-        if (!Shiboken::Wrapper::hasParentInfo(_pySelf))
-            Shiboken::Wrapper::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0);
+        if (!Shiboken::Object::hasParentInfo(_pySelf))
+            Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0);
     </template>
     <!-- templates for __reduce__ -->
     <template name="reduce_code">