YES! We finally have dynamic signals between Core and Client, meaning that arbitrary

[quassel.git] / src / common / signalproxy.cpp

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index bd12b15..d6c105b 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -44,6 +44,7 @@ void SignalProxy::addPeer(QIODevice *dev) {
   Connection conn;
   conn.device = dev;
   conn.peer = new QxtRPCPeer(dev, QxtRPCPeer::Peer, this);
+  connect(conn.peer, SIGNAL(peerDisconnected()), this, SLOT(socketDisconnected()));
 
   foreach(SlotDesc slot, attachedSlots) {
     conn.peer->attachSlot(slot.rpcFunction, slot.recv, slot.slot);
@@ -55,6 +56,20 @@ void SignalProxy::addPeer(QIODevice *dev) {
 
 }
 
+void SignalProxy::socketDisconnected() {
+  for(int i = 0; i < peers.count(); i++) {
+    Connection conn = peers[i];
+    QAbstractSocket *sock = qobject_cast<QAbstractSocket*>(conn.device);
+    if(!sock) continue;
+    if(sock->state() == QAbstractSocket::UnconnectedState) {
+      peers[i].peer->deleteLater(); peers[i].device->deleteLater();
+      peers.removeAt(i);
+      emit peerDisconnected();
+      i--;
+    }
+  }
+}
+
 void SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& rpcFunction) {
   foreach(Connection conn, peers) {
     conn.peer->attachSignal(sender, signal, rpcFunction);
@@ -79,3 +94,9 @@ void SignalProxy::detachObject(QObject* obj) {
 
 }
 
+void SignalProxy::sendSignal(const char *signal, QVariant p1, QVariant p2, QVariant p3, QVariant p4, QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9) {
+  foreach(Connection conn, peers) {
+    conn.peer->call(signal, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+  }
+}
+