diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 14:37:16 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 14:37:16 -0200 |
| commit | a8ae0680f23ca5e702a662cf36a465b7a7b2788a (patch) | |
| tree | 13257f86b17d96261cd8713463bf75c14d507cbf /PySide/QtCore/qvariant_conversions.h | |
| parent | 6cefd33cd08232b25a3b81d598b88ec47aa5aad2 (diff) | |
Adapt to API changes in libshiboken.
Diffstat (limited to 'PySide/QtCore/qvariant_conversions.h')
| -rw-r--r-- | PySide/QtCore/qvariant_conversions.h | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |