X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=5e064252e998903f7ad7e4db7ab6e75743081b66;hp=448982975ae2ca7567d894896b634a045e4d57d0;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=249a178a775bce425a83aefd7c7c39a868ebfe98

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index 44898297..5e064252 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef REMOTEPEER_H
-#define REMOTEPEER_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QDateTime>
 
@@ -32,7 +33,7 @@ class QTimer;
 
 class AuthHandler;
 
-class RemotePeer : public Peer
+class COMMON_EXPORT RemotePeer : public Peer
 {
     Q_OBJECT
 
@@ -41,20 +42,22 @@ public:
     using Peer::handle;
     using Peer::dispatch;
 
-    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = 0);
+    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
 
-    void setSignalProxy(SignalProxy *proxy);
+    void setSignalProxy(SignalProxy *proxy) override;
 
-    virtual Protocol::Type protocol() const = 0;
     virtual QString protocolName() const = 0;
-    virtual QString description() const;
+    QString description() const override;
     virtual quint16 enabledFeatures() const { return 0; }
 
-    bool isOpen() const;
-    bool isSecure() const;
-    bool isLocal() const;
+    QString address() const override;
+    quint16 port() const override;
+
+    bool isOpen() const override;
+    bool isSecure() const override;
+    bool isLocal() const override;
 
-    int lag() const;
+    int lag() const override;
 
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);
@@ -62,15 +65,18 @@ public:
     QTcpSocket *socket() const;
 
 public slots:
-    void close(const QString &reason = QString());
+    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);
 
+    // Only used by LegacyPeer
+    void protocolVersionMismatch(int actual, int expected);
+
 protected:
-    SignalProxy *signalProxy() const;
+    SignalProxy *signalProxy() const override;
 
     void writeMessage(const QByteArray &msg);
     virtual void processMessage(const QByteArray &msg) = 0;
@@ -104,5 +110,3 @@ private:
     int _lag;
     quint32 _msgSize;
 };
-
-#endif