X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fprotocols%2Fdatastream%2Fdatastreampeer.h;h=7d04f4b5dfd3ce0bf3645a8021ae18e05cf4760d;hb=b2169e5f4cbd3ce724c4808b62ddc2b8941219a5;hp=6f8a66c53289176327ca248c77c4f7044979fa0e;hpb=89aa3d278f7b5fac996f0b9480737e5932d54c41;p=quassel.git

diff --git a/src/common/protocols/datastream/datastreampeer.h b/src/common/protocols/datastream/datastreampeer.h
index 6f8a66c5..7d04f4b5 100644
--- a/src/common/protocols/datastream/datastreampeer.h
+++ b/src/common/protocols/datastream/datastreampeer.h
@@ -21,8 +21,6 @@
 #ifndef DATASTREAMPEER_H
 #define DATASTREAMPEER_H
 
-#include <QDataStream>
-
 #include "../../remotepeer.h"
 
 class QDataStream;
@@ -44,6 +42,7 @@ 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);
@@ -71,20 +70,15 @@ public:
 signals:
     void protocolError(const QString &errorString);
 
-protected slots:
-    void onSocketDataAvailable();
-
 private:
-    bool readSocketData(QByteArray &data);
-    void writeSocketData(const QVariantList &list);
-    void writeSocketData(const QVariantMap &handshakeMsg);
+    using RemotePeer::writeMessage;
+    void writeMessage(const QVariantMap &handshakeMsg);
+    void writeMessage(const QVariantList &sigProxyMsg);
+    void processMessage(const QByteArray &msg);
 
     void handleHandshakeMessage(const QVariantList &mapData);
     void handlePackedFunc(const QVariantList &packedFunc);
     void dispatchPackedFunc(const QVariantList &packedFunc);
-
-    QDataStream _stream;
-    quint32 _blockSize;
 };
 
 #endif