jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call connectNotify methods when connecting signals.

Browse source
This commit is contained in:
Hugo Lima 2010-01-12 10:49:31 -02:00
commit 7ae0956ba6
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
PySide/QtCore/glue/qobject_connect.cpp
View file

@ -1,4 +1,4 @@
static int qobjectGetMethodIndex(QObject* source, const char* signature, QMetaMethod::MethodType type) static void registerDynSignalSlot(QObject* source, const char* signature, QMetaMethod::MethodType type)
{ {
const QMetaObject* metaObject = source->metaObject(); const QMetaObject* metaObject = source->metaObject();
int methodIndex = metaObject->indexOfMethod(signature); int methodIndex = metaObject->indexOfMethod(signature);
@ -7,16 +7,14 @@ static int qobjectGetMethodIndex(QObject* source, const char* signature, QMetaMe
SbkBaseWrapper* self = (SbkBaseWrapper*) BindingManager::instance().retrieveWrapper(source); SbkBaseWrapper* self = (SbkBaseWrapper*) BindingManager::instance().retrieveWrapper(source);
if (!self->containsCppWrapper) { if (!self->containsCppWrapper) {
qWarning() << "You can't add dynamic signals or slots on an object originated from C++."; qWarning() << "You can't add dynamic signals or slots on an object originated from C++.";
return false; } else {
PySide::DynamicQMetaObject* dynMetaObj = reinterpret_cast<PySide::DynamicQMetaObject*>(const_cast<QMetaObject*>(metaObject));
if (type == QMetaMethod::Signal)
dynMetaObj->addSignal(signature);
else
dynMetaObj->addSlot(signature);
} }
PySide::DynamicQMetaObject* dynMetaObj = reinterpret_cast<PySide::DynamicQMetaObject*>(const_cast<QMetaObject*>(metaObject));
if (type == QMetaMethod::Signal)
dynMetaObj->addSignal(signature);
else
dynMetaObj->addSlot(signature);
methodIndex = metaObject->indexOfMethod(signature);
} }
return methodIndex;
} }
static bool qobjectConnect(QObject* source, const char* signal, QObject* receiver, const char* slot, Qt::ConnectionType type) static bool qobjectConnect(QObject* source, const char* signal, QObject* receiver, const char* slot, Qt::ConnectionType type)
@ -25,14 +23,12 @@ static bool qobjectConnect(QObject* source, const char* signal, QObject* receive
return false; return false;
signal++; signal++;
const QMetaObject* metaObject = source->metaObject(); registerDynSignalSlot(source, signal, QMetaMethod::Signal);
int signalIndex = qobjectGetMethodIndex(source, signal, QMetaMethod::Signal);
bool isSignal = PySide::isSignal(slot); bool isSignal = PySide::isSignal(slot);
slot++; slot++;
metaObject = receiver->metaObject(); registerDynSignalSlot(receiver, slot, isSignal ? QMetaMethod::Signal : QMetaMethod::Slot);
int slotIndex = qobjectGetMethodIndex(receiver, slot, isSignal ? QMetaMethod::Signal : QMetaMethod::Slot); return QObject::connect(source, signal - 1, receiver, slot - 1, type);
return QMetaObject::connect(source, signalIndex, receiver, slotIndex, type);
} }
static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject* callback, Qt::ConnectionType type) static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject* callback, Qt::ConnectionType type)
@ -41,8 +37,8 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
return false; return false;
signal++; signal++;
const QMetaObject* metaObject = source->metaObject(); registerDynSignalSlot(source, signal, QMetaMethod::Signal);
int signalIndex = qobjectGetMethodIndex(source, signal, QMetaMethod::Signal); int signalIndex = source->metaObject()->indexOfMethod(signal);
PySide::SignalManager& signalManager = PySide::SignalManager::instance(); PySide::SignalManager& signalManager = PySide::SignalManager::instance();
@ -63,13 +59,13 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
if (usingGlobalReceiver) if (usingGlobalReceiver)
receiver = signalManager.globalReceiver(); receiver = signalManager.globalReceiver();
metaObject = receiver->metaObject(); const QMetaObject* metaObject = receiver->metaObject();
const QByteArray callbackSig = PySide::getCallbackSignature(signal, callback, usingGlobalReceiver).toAscii(); const QByteArray callbackSig = PySide::getCallbackSignature(signal, callback, usingGlobalReceiver).toAscii();
const char* slot = callbackSig.constData(); const char* slot = callbackSig.constData();
int slotIndex = metaObject->indexOfSlot(slot); int slotIndex = metaObject->indexOfSlot(slot);
if (slotIndex == -1) { if (slotIndex == -1) {
if (!usingGlobalReceiver and !((SbkBaseWrapper*)self)->containsCppWrapper) { if (!usingGlobalReceiver and !((SbkBaseWrapper*)self)->containsCppWrapper) {
qWarning() << "You cant add dynamic slots on an object originated from C++."; qWarning() << "You can't add dynamic slots on an object originated from C++.";
return false; return false;
} }
if (usingGlobalReceiver) { if (usingGlobalReceiver) {
@ -81,6 +77,13 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
slotIndex = metaObject->indexOfSlot(slot); slotIndex = metaObject->indexOfSlot(slot);
} }
if (QMetaObject::connect(source, signalIndex, receiver, slotIndex, type)) { 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);
#endif
if (usingGlobalReceiver) if (usingGlobalReceiver)
signalManager.globalReceiverConnectNotify(slotIndex); signalManager.globalReceiverConnectNotify(slotIndex);