diff options
author | Renato Araujo Oliveira Filho <renato.filho@openbossa.org> | 2010-11-19 15:02:42 -0300 |
---|---|---|
committer | Renato Araujo Oliveira Filho <renato.filho@openbossa.org> | 2010-11-19 16:05:00 -0300 |
commit | c9aef92cab51623aba0211c5805c88386c638e0a (patch) | |
tree | 61426bf65dee72162eb406bfbb649c016e881976 /PySide | |
parent | 5e0550446c3546beb4a7076a80a7475b394567f4 (diff) |
Update to new Shiboken API (Renamed SbkObjectType)
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Hugo Parente Lima <hugo.pl@gmail.com>
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtCore/glue/qcoreapplication_init.cpp | 2 | ||||
-rw-r--r-- | PySide/QtCore/qvariant_conversions.h | 12 | ||||
-rw-r--r-- | PySide/QtCore/qvariant_type_conversions.h | 4 | ||||
-rw-r--r-- | PySide/QtGui/glue/qapplication_init.cpp | 2 | ||||
-rw-r--r-- | PySide/QtGui/glue/qlayout_help_functions.h | 4 | ||||
-rw-r--r-- | PySide/QtGui/glue/qwidget_glue.h | 2 | ||||
-rw-r--r-- | PySide/QtGui/qpixmap_conversion.h | 12 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 4 |
8 files changed, 21 insertions, 21 deletions
diff --git a/PySide/QtCore/glue/qcoreapplication_init.cpp b/PySide/QtCore/glue/qcoreapplication_init.cpp index 274afb6d3..446074c67 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::isUserType(self) && !Shiboken::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >())) + if (Shiboken::Wrapper::isUserType(self) && !Shiboken::BaseType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication >())) return -1; diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h index a2ac42786..bfff5651f 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, &SbkObjectType_Type)) { - SbkObjectType* sbkType = reinterpret_cast<SbkObjectType*>(type); - QByteArray typeName(sbkType->original_name); + if (PyObject_TypeCheck(type, &SbkBaseType_Type)) { + SbkBaseType* sbkType = reinterpret_cast<SbkBaseType*>(type); + QByteArray typeName(Shiboken::BaseType::getOriginalName(sbkType)); bool valueType = !typeName.endsWith("*"); // Do not convert user type of value - if (valueType && sbkType->is_user_type) + if (valueType && Shiboken::BaseType::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::isShibokenType(pyObj)) { - SbkObjectType* objType = reinterpret_cast<SbkObjectType*>(pyObj->ob_type); + if (Shiboken::Wrapper::checkType(pyObj)) { + SbkBaseType* objType = reinterpret_cast<SbkBaseType*>(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 4ec47653f..74b3289d1 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 == &SbkObjectType_Type) - typeName = reinterpret_cast<SbkObjectType*>(pyObj)->original_name; + if (pyObj->ob_type == &SbkBaseType_Type) + typeName = Shiboken::BaseType::getOriginalName(reinterpret_cast<SbkBaseType*>(pyObj)); else typeName = reinterpret_cast<PyTypeObject*>(pyObj)->tp_name; } diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp index 51ed3fff4..b4bf32491 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::isUserType(self) && !Shiboken::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication>())) + if (Shiboken::Wrapper::isUserType(self) && !Shiboken::BaseType::canCallConstructor(self->ob_type, Shiboken::SbkType<QApplication>())) return -1; if (QApplication::instance()) { diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h index 8d899eab5..3361e618a 100644 --- a/PySide/QtGui/glue/qlayout_help_functions.h +++ b/PySide/QtGui/glue/qlayout_help_functions.h @@ -18,7 +18,7 @@ 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::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true); + Shiboken::Wrapper::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)); @@ -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::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true); + Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true); return; } diff --git a/PySide/QtGui/glue/qwidget_glue.h b/PySide/QtGui/glue/qwidget_glue.h index 33e8a7f55..469868877 100644 --- a/PySide/QtGui/glue/qwidget_glue.h +++ b/PySide/QtGui/glue/qwidget_glue.h @@ -34,7 +34,7 @@ static inline void qwidgetReparentLayout(QWidget *parent, QLayout *layout) Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(layout)); Shiboken::Wrapper::setParent(pyParent, pyChild); //remove previous references - Shiboken::keepReference(reinterpret_cast<SbkObject*>(pyChild.object()), qPrintable(retrieveObjectName(pyChild)), Py_None); + Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(pyChild.object()), qPrintable(retrieveObjectName(pyChild)), Py_None); } static inline void qwidgetSetLayout(QWidget *self, QLayout *layout) diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h index ba21e08d6..f6a2e58eb 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; - SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>()); + SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<QPixmap>()); bool isVariant = Converter<QVariant>::checkType(pyobj); if (isVariant) { QVariant var(Converter<QVariant>::toCpp(pyobj)); return var.type() == QVariant::Pixmap; } else if (Converter<QSize>::checkType(pyobj) || Converter<QString>::checkType(pyobj)) { return true; - } else if (shiboType->ext_isconvertible) { - return shiboType->ext_isconvertible(pyobj); + } else { + return Shiboken::BaseType::isExternalConvertible(shiboType, pyobj); } return false; @@ -24,7 +24,7 @@ inline bool Converter<QPixmap>::isConvertible(PyObject* pyobj) inline QPixmap Converter<QPixmap>::toCpp(PyObject* pyobj) { - SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>()); + SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(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 (shiboType->ext_isconvertible && shiboType->ext_tocpp && shiboType->ext_isconvertible(pyobj)) { - QPixmap* cptr = reinterpret_cast<QPixmap*>(shiboType->ext_tocpp(pyobj)); + } else if (Shiboken::BaseType::isExternalConvertible(shiboType, pyobj) && Shiboken::BaseType::hasExternalCppConversions(shiboType)) { + QPixmap* cptr = reinterpret_cast<QPixmap*>(Shiboken::BaseType::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 ca7bc27b2..d9f75745b 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -3317,7 +3317,7 @@ <modify-function signature="setStyle(QStyle*)"> <inject-code class="target" position="end"> - Shiboken::keepReference(reinterpret_cast<SbkObject*>(%PYSELF), "__style__", %PYARG_1); + Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(%PYSELF), "__style__", %PYARG_1); </inject-code> </modify-function> <modify-function signature="style()const"> @@ -3331,7 +3331,7 @@ Shiboken::Wrapper::setParent(pyApp, %PYARG_0); Shiboken::Wrapper::releaseOwnership(%PYARG_0); } else { - Shiboken::keepReference(reinterpret_cast<SbkObject*>(%PYSELF), "__style__", %PYARG_0); + Shiboken::Wrapper::keepReference(reinterpret_cast<SbkObject*>(%PYSELF), "__style__", %PYARG_0); } } </inject-code> |