}
SignalProxy::~SignalProxy() {
+ //qDebug() << "peers:" << peers.count();
foreach(Connection conn, peers) {
conn.peer->deleteLater(); conn.device->deleteLater();
}
}
void SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& rpcFunction) {
+ disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+ connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+
foreach(Connection conn, peers) {
conn.peer->attachSignal(sender, signal, rpcFunction);
}
attachedSignals.append(SignalDesc(sender, signal, rpcFunction));
-
}
void SignalProxy::attachSlot(const QByteArray& rpcFunction, QObject* recv, const char* slot) {
+ disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+ connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+
foreach(Connection conn, peers) {
conn.peer->attachSlot(rpcFunction, recv, slot);
}
}
void SignalProxy::detachObject(QObject* obj) {
- Q_ASSERT(false); // not done yet
+ //Q_ASSERT(false); // not done yet
foreach(Connection conn, peers) {
conn.peer->detachObject(obj);
}
- // FIXME: delete attached signal/slot info
-
+ QList<SignalDesc> sigs;
+ foreach(SignalDesc desc, attachedSignals) {
+ if(desc.sender != obj) sigs << desc;
+ }
+ attachedSignals = sigs;
+ QList<SlotDesc> slot;
+ foreach(SlotDesc desc, attachedSlots) {
+ if(desc.recv != obj) slot << desc;
+ }
+ attachedSlots = slot;
+ // FIXME: test this!
}
void SignalProxy::sendSignal(const char *signal, QVariant p1, QVariant p2, QVariant p3, QVariant p4, QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9) {