X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=f44db23ef1e4f608c6912bfc900ec2b6dfb61fe0;hb=42ce41212deabaf284cc496760cb901b9e3b4dc4;hp=ed8b46b0b94b5a93571646ff3aedd6129e555349;hpb=06a03c2c69ee934aaeec83512bae2fffee83a340;p=quassel.git

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index ed8b46b0..f44db23e 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -21,9 +21,10 @@
 #ifndef _RPCPEER_H_
 #define _RPCPEER_H_
 
-#include "qxtrpcpeer.h"
 #include <QtCore>
 
+class QxtRPCPeer;
+
 class SignalProxy : public QObject {
   Q_OBJECT
 
@@ -34,18 +35,18 @@ class SignalProxy : public QObject {
     SignalProxy(ProxyType type, QIODevice *device = 0, QObject *parent = 0);
     ~SignalProxy();
 
+  ProxyType proxyType() const { return type; }
     void attachSignal(QObject* sender, const char* signal, const QByteArray& rpcFunction = QByteArray());
     void attachSlot(const QByteArray& rpcFunction, QObject* recv, const char* slot);
 
-    void detachObject(QObject* obj);
-
   public slots:
     void addPeer(QIODevice *device);
 
     void sendSignal(const char *signal, QVariant p1 = QVariant(), QVariant p2 = QVariant(), QVariant p3 = QVariant(), QVariant p4 = QVariant(),
               QVariant p5 = QVariant(), QVariant p6 = QVariant(), QVariant p7 = QVariant(), QVariant p8 = QVariant(), QVariant p9 = QVariant());
-
+  
     //void detachSender();
+    void detachObject(QObject *);
 
   signals:
     void peerDisconnected();
@@ -61,7 +62,7 @@ class SignalProxy : public QObject {
 
     struct SignalDesc {
       QObject *sender;
-      const char *signal;
+      QByteArray signal;
       QByteArray rpcFunction;
 
       SignalDesc(QObject *sndr, const char *sig, const QByteArray &func) : sender(sndr), signal(sig), rpcFunction(func) {}
@@ -70,7 +71,7 @@ class SignalProxy : public QObject {
     struct SlotDesc {
       QByteArray rpcFunction;
       QObject *recv;
-      const char *slot;
+      QByteArray slot;
 
       SlotDesc(const QByteArray& func, QObject* r, const char* s) : rpcFunction(func), recv(r), slot(s) {}
     };