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/glue/qobject_connect.cpp | |
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/glue/qobject_connect.cpp')
-rw-r--r-- | PySide/QtCore/glue/qobject_connect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |