X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=a966700520581c743ec2a9d81c9e1f149b4073a9;hp=645157ef84b6a8778f8bf1161bbd32e17b229d3a;hb=c2fc6343afb7ac0bba9fc5a019fdadbefc35f546;hpb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 645157ef..a9667005 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,9 +33,12 @@
 #include <QByteArray>
 #include <QTimer>
 
+#include "protocol.h"
+
 class SyncableObject;
 struct QMetaObject;
 
+
 class SignalProxy : public QObject
 {
     Q_OBJECT
@@ -45,11 +48,6 @@ class SignalProxy : public QObject
 public:
     class AbstractPeer;
 
-    class SyncMessage;
-    class RpcCall;
-    class InitRequest;
-    class InitData;
-
     enum ProxyMode {
         Server,
         Client
@@ -131,10 +129,10 @@ private:
     template<class T>
     void dispatch(const T &protoMessage);
 
-    void handle(AbstractPeer *peer, const SyncMessage &syncMessage);
-    void handle(AbstractPeer *peer, const RpcCall &rpcCall);
-    void handle(AbstractPeer *peer, const InitRequest &initRequest);
-    void handle(AbstractPeer *peer, const InitData &initData);
+    void handle(AbstractPeer *peer, const Protocol::SyncMessage &syncMessage);
+    void handle(AbstractPeer *peer, const Protocol::RpcCall &rpcCall);
+    void handle(AbstractPeer *peer, const Protocol::InitRequest &initRequest);
+    void handle(AbstractPeer *peer, const Protocol::InitData &initData);
 
     bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue);
     bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params = QVariantList());
@@ -170,8 +168,8 @@ private:
 
     friend class SignalRelay;
     friend class SyncableObject;
-    friend class InternalConnection;
-    friend class RemoteConnection;
+    friend class InternalPeer;
+    friend class RemotePeer;
 };
 
 
@@ -182,7 +180,7 @@ class SignalProxy::ExtendedMetaObject
 {
     class MethodDescriptor
     {
-public:
+    public:
         MethodDescriptor(const QMetaMethod &method);
         MethodDescriptor() : _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client) {}
 
@@ -192,7 +190,7 @@ public:
         inline int minArgCount() const { return _minArgCount; }
         inline SignalProxy::ProxyMode receiverMode() const { return _receiverMode; }
 
-private:
+    private:
         QByteArray _methodName;
         QList<int> _argTypes;
         int _returnType;
@@ -252,15 +250,13 @@ public:
     virtual bool isSecure() const = 0;
     virtual bool isLocal() const = 0;
 
-    virtual QString errorString() const { return QString(); }
-
     virtual int lag() const = 0;
 
 public slots:
-    virtual void dispatch(const SyncMessage &msg) = 0;
-    virtual void dispatch(const RpcCall &msg) = 0;
-    virtual void dispatch(const InitRequest &msg) = 0;
-    virtual void dispatch(const InitData &msg) = 0;
+    virtual void dispatch(const Protocol::SyncMessage &msg) = 0;
+    virtual void dispatch(const Protocol::RpcCall &msg) = 0;
+    virtual void dispatch(const Protocol::InitRequest &msg) = 0;
+    virtual void dispatch(const Protocol::InitData &msg) = 0;
 
     virtual void close(const QString &reason = QString()) = 0;
 
@@ -271,75 +267,4 @@ signals:
     void lagUpdated(int msecs);
 };
 
-
-// ==================================================
-//  Protocol Messages
-// ==================================================
-class SignalProxy::SyncMessage
-{
-public:
-    inline SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList &params)
-    : _className(className), _objectName(objectName), _slotName(slotName), _params(params) {}
-
-    inline QByteArray className() const { return _className; }
-    inline QString objectName() const { return _objectName; }
-    inline QByteArray slotName() const { return _slotName; }
-
-    inline QVariantList params() const { return _params; }
-
-private:
-    QByteArray _className;
-    QString _objectName;
-    QByteArray _slotName;
-    QVariantList _params;
-};
-
-
-class SignalProxy::RpcCall
-{
-public:
-    inline RpcCall(const QByteArray &slotName, const QVariantList &params)
-    : _slotName(slotName), _params(params) {}
-
-    inline QByteArray slotName() const { return _slotName; }
-    inline QVariantList params() const { return _params; }
-
-private:
-    QByteArray _slotName;
-    QVariantList _params;
-};
-
-
-class SignalProxy::InitRequest
-{
-public:
-    inline InitRequest(const QByteArray &className, const QString &objectName)
-    : _className(className), _objectName(objectName) {}
-
-    inline QByteArray className() const { return _className; }
-    inline QString objectName() const { return _objectName; }
-
-private:
-    QByteArray _className;
-    QString _objectName;
-};
-
-
-class SignalProxy::InitData
-{
-public:
-    inline InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData)
-    : _className(className), _objectName(objectName), _initData(initData) {}
-
-    inline QByteArray className() const { return _className; }
-    inline QString objectName() const { return _objectName; }
-
-    inline QVariantMap initData() const { return _initData; }
-
-private:
-    QByteArray _className;
-    QString _objectName;
-    QVariantMap _initData;
-};
-
 #endif