X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=b34d59f4c077c726569c09b246774072c5d22a98;hp=8a47b0a716e6849c83496a2fdc843e8d08431a89;hb=579e559a6322209df7cd51c34801fecff5fe734b;hpb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index 8a47b0a7..b34d59f4 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -39,12 +39,12 @@ class COMMON_EXPORT RemotePeer : public Peer
 
 public:
     // import the virtuals from the baseclass
-    using Peer::handle;
     using Peer::dispatch;
+    using Peer::handle;
 
-    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
+    RemotePeer(AuthHandler* authHandler, QTcpSocket* socket, Compressor::CompressionLevel level, QObject* parent = nullptr);
 
-    void setSignalProxy(SignalProxy *proxy) override;
+    void setSignalProxy(SignalProxy* proxy) override;
 
     virtual QString protocolName() const = 0;
     QString description() const override;
@@ -62,27 +62,30 @@ public:
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);
 
-    QTcpSocket *socket() const;
+    QTcpSocket* socket() const;
 
 public slots:
-    void close(const QString &reason = QString()) override;
+    void close(const QString& reason = QString()) override;
 
 signals:
     void transferProgress(int current, int max);
-    void socketError(QAbstractSocket::SocketError error, const QString &errorString);
-    void statusMessage(const QString &msg);
+    void socketError(QAbstractSocket::SocketError error, const QString& errorString);
+    void statusMessage(const QString& msg);
+
+    // Only used by LegacyPeer
+    void protocolVersionMismatch(int actual, int expected);
 
 protected:
-    SignalProxy *signalProxy() const override;
+    SignalProxy* signalProxy() const override;
 
-    void writeMessage(const QByteArray &msg);
-    virtual void processMessage(const QByteArray &msg) = 0;
+    void writeMessage(const QByteArray& msg);
+    virtual void processMessage(const QByteArray& msg) = 0;
 
     // These protocol messages get handled internally and won't reach SignalProxy
-    void handle(const Protocol::HeartBeat &heartBeat);
-    void handle(const Protocol::HeartBeatReply &heartBeatReply);
-    virtual void dispatch(const Protocol::HeartBeat &msg) = 0;
-    virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
+    void handle(const Protocol::HeartBeat& heartBeat);
+    void handle(const Protocol::HeartBeatReply& heartBeatReply);
+    virtual void dispatch(const Protocol::HeartBeat& msg) = 0;
+    virtual void dispatch(const Protocol::HeartBeatReply& msg) = 0;
 
 protected slots:
     virtual void onSocketStateChanged(QAbstractSocket::SocketState state);
@@ -96,13 +99,13 @@ private slots:
     void changeHeartBeatInterval(int secs);
 
 private:
-    bool readMessage(QByteArray &msg);
+    bool readMessage(QByteArray& msg);
 
 private:
-    QTcpSocket *_socket;
-    Compressor *_compressor;
-    SignalProxy *_signalProxy;
-    QTimer *_heartBeatTimer;
+    QTcpSocket* _socket;
+    Compressor* _compressor;
+    SignalProxy* _signalProxy;
+    QTimer* _heartBeatTimer;
     int _heartBeatCount;
     int _lag;
     quint32 _msgSize;