diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 15:04:27 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 15:04:27 -0200 |
| commit | f31d9107555376e60757b9c8054030e2cf7bddad (patch) | |
| tree | 9507ec8beeaf12ac46210c89e4827104a33f0cbe /PySide/QtCore/qvariant_type_conversions.h | |
| parent | e635023cdb91452e719f16afb70d3d19b01aed34 (diff) | |
| parent | a8ae0680f23ca5e702a662cf36a465b7a7b2788a (diff) | |
Merge branch 'apichanges'
Reviewer: Renato Araújo <renato.filho@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
Conflicts:
libpyside/pyside.cpp
Diffstat (limited to 'PySide/QtCore/qvariant_type_conversions.h')
| -rw-r--r-- | PySide/QtCore/qvariant_type_conversions.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |