Merging NetworkConnection into CoreNetwork.

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

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 82db1ab..c551c24 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -45,12 +45,18 @@
 // ==================================================
 class PeerSignalEvent : public QEvent {
 public:
-  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::Type(SignalProxy::PeerSignal)), sender(sender), requestType(requestType), params(params) {}
   SignalProxy *sender;
   SignalProxy::RequestType requestType;
   QVariantList params;
 };
 
+class RemovePeerEvent : public QEvent {
+public:
+  RemovePeerEvent(QObject *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeer)), peer(peer) {}
+  QObject *peer;
+};
+
 // ==================================================
 //  SIGNALRELAY
 // ==================================================
@@ -306,19 +312,16 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     return false;
   }
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+  if(!iodev->isOpen()) {
+    qWarning("SignalProxy::addPeer(QIODevice *iodev): iodev needs to be open!");
+    return false;
+  }
 
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  }
-
-  if(!sock->parent())
-    sock->setParent(this);
+  if(!iodev->parent())
+    iodev->setParent(this);
 
   _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 
@@ -714,9 +717,9 @@ void SignalProxy::detachSender() {
 }
 
 void SignalProxy::detachObject(QObject* obj) {
+  stopSync(static_cast<SyncableObject *>(obj));
   detachSignals(obj);
   detachSlots(obj);
-  stopSync(static_cast<SyncableObject *>(obj));
 }
 
 void SignalProxy::detachSignals(QObject* sender) {
@@ -759,7 +762,10 @@ void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantL
     case AbstractPeer::IODevicePeer:
       {
        IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-       ioPeer->dispatchPackedFunc(packedFunc);
+       if(ioPeer->isOpen())
+         ioPeer->dispatchPackedFunc(packedFunc);
+       else
+         QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key()));
       }
       break;
     case AbstractPeer::SignalProxyPeer:
@@ -1101,7 +1107,8 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
 
 bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const {
   // if we don't even have the same basename it's a sure NO
-  if(methodBaseName(signal) != methodBaseName(slot))
+  QString baseName = methodBaseName(signal);
+  if(baseName != methodBaseName(slot))
     return false;
 
   // are the signatures compatible?
@@ -1109,11 +1116,20 @@ bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slo
     return false;
 
   // we take an educated guess if the signals and slots match
-  QString signalsuffix = ::methodName(signal).mid(QString(::methodName(signal)).lastIndexOf(QRegExp("[A-Z]"))).toLower();
-  QString slotprefix = ::methodName(slot).left(QString(::methodName(slot)).indexOf(QRegExp("[A-Z]"))).toLower();
-
+  QString signalsuffix = ::methodName(signal);
+  QString slotprefix = ::methodName(slot);
+  if(!baseName.isEmpty()) {
+    signalsuffix = signalsuffix.mid(baseName.count()).toLower();
+    slotprefix = slotprefix.left(slotprefix.count() - baseName.count()).toLower();
+  }
+  
   uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
   int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
+//   if(ratio < 2) {
+//     qDebug() << Q_FUNC_INFO;
+//     qDebug() << methodBaseName(signal) << methodBaseName(slot);
+//     qDebug() << signalsuffix << slotprefix << sizediff << ratio;
+//   }
   return (ratio < 2);
 }
 
@@ -1201,13 +1217,19 @@ void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &
 
 void SignalProxy::customEvent(QEvent *event) {
   switch(event->type()) {
-  case QEvent::User:
+  case PeerSignal:
     {
-      PeerSignalEvent *sig = static_cast<PeerSignalEvent *>(event);
-      receivePeerSignal(sig->sender, sig->requestType, sig->params);
+      PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(e->sender, e->requestType, e->params);
     }
     event->accept();
     break;
+  case RemovePeer:
+    {
+      RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+      removePeer(e->peer);
+    }
+    event->accept();
   default:
     return;
   }
@@ -1261,13 +1283,7 @@ void SignalProxy::dumpSyncMap(SyncableObject *object) {
   QHash<QByteArray, int> syncMap_ = syncMap(object);
   QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
   while(iter != syncMap_.constEnd()) {
-    qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();
+    qDebug() << qPrintable(QString("%1 --> %2 %3").arg(QString(iter.key()), 40).arg(iter.value()).arg(QString(meta->method(iter.value()).signature())));
     iter++;
   }
-//   QHash<int, int> syncMap_ = syncMap(object);
-//   QHash<int, int>::const_iterator iter = syncMap_.constBegin();
-//   while(iter != syncMap_.constEnd()) {
-//     qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
-//     iter++;
-//   }
 }