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/QtGui/glue | |
| 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/QtGui/glue')
| -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 |
3 files changed, 4 insertions, 4 deletions
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) |