summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-06-03 08:30:49 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-06-03 11:11:40 -0300
commitee6303819e9aaba0aa0b9c5d1d9a84248dff6b1b (patch)
tree892a0650093232bcaf8da88e55b90cae8ef10978
parent5863f2dc8e73f2e766fca8a2628f2e784b684d9a (diff)
downloadpyside-ee6303819e9aaba0aa0b9c5d1d9a84248dff6b1b.tar.gz
pyside-ee6303819e9aaba0aa0b9c5d1d9a84248dff6b1b.tar.xz
pyside-ee6303819e9aaba0aa0b9c5d1d9a84248dff6b1b.zip
Fixed custom code related to connectNotify behaviour.
The code injection that deals with calling connectNotify in the binding generated with the protected hack turned off should call the connectNotify method directly instead of using the protected caller. Reviewed by Renato Ara├║jo <renato.filho@openbossa.org> Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--PySide/QtCore/glue/qobject_connect.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index 698b3c8..5b6f254 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -72,12 +72,12 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
slotIndex = metaObject->indexOfSlot(slot);
}
if (QMetaObject::connect(source, signalIndex, receiver, slotIndex, type)) {
- // FIXME: Need to cast to QObjectWrapper* and call the public version of connectNotify
- // when avoiding the protected hack.
#ifndef AVOID_PROTECTED_HACK
source->connectNotify(signal);
#else
- reinterpret_cast<QObjectWrapper*>(source)->connectNotify_protected(signal);
+ // Need to cast to QObjectWrapper* and call the public version of
+ // connectNotify when avoiding the protected hack.
+ reinterpret_cast<QObjectWrapper*>(source)->connectNotify(signal);
#endif
if (usingGlobalReceiver)
signalManager.globalReceiverConnectNotify(source, slotIndex);