X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fprotocols%2Fdatastream%2Fdatastreampeer.h;h=c733fda240bcf23353393875dbd0081e0c96468a;hb=2e9855c688c827b2159fbb548bf816de360e3ae3;hp=a0e8f91ba7483e6f14ba1970db62d4a54f4bc97e;hpb=db9bba48e1674f169d1ed3cf184e5fa56dbe3a80;p=quassel.git

diff --git a/src/common/protocols/datastream/datastreampeer.h b/src/common/protocols/datastream/datastreampeer.h
index a0e8f91b..c733fda2 100644
--- a/src/common/protocols/datastream/datastreampeer.h
+++ b/src/common/protocols/datastream/datastreampeer.h
@@ -44,13 +44,12 @@ public:
     DataStreamPeer(AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent = 0);
 
     Protocol::Type protocol() const { return Protocol::DataStreamProtocol; }
+    QString protocolName() const { return "the DataStream protocol"; }
 
     static quint16 supportedFeatures();
     static bool acceptsFeatures(quint16 peerFeatures);
     quint16 enabledFeatures() const;
 
-    void setSignalProxy(SignalProxy *proxy);
-
     void dispatch(const Protocol::RegisterClient &msg);
     void dispatch(const Protocol::ClientDenied &msg);
     void dispatch(const Protocol::ClientRegistered &msg);
@@ -73,22 +72,20 @@ public:
 signals:
     void protocolError(const QString &errorString);
 
-    // only used in compat mode
-    void protocolVersionMismatch(int actual, int expected);
-
 protected slots:
     void onSocketDataAvailable();
 
 private:
-    bool readSocketData(QVariant &item);
-    void writeSocketData(const QVariant &item);
-    void handleHandshakeMessage(const QVariant &msg);
-    void handlePackedFunc(const QVariant &packedFunc);
+    bool readSocketData(QByteArray &data);
+    void writeSocketData(const QVariantList &list);
+    void writeSocketData(const QVariantMap &handshakeMsg);
+
+    void handleHandshakeMessage(const QVariantList &mapData);
+    void handlePackedFunc(const QVariantList &packedFunc);
     void dispatchPackedFunc(const QVariantList &packedFunc);
 
     QDataStream _stream;
     quint32 _blockSize;
-    bool _useCompression;
 };
 
 #endif