X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=191439ef2b402df9c2352e36cd64b93a79aeab49;hp=5751dfb861542042ad1cc3b595361a34e551fbc4;hb=3d464695bf5b57c969f30e6f3b8b429890f976bf;hpb=fd25e92f19d6afd4eb02844bcbf20ba132868303;ds=sidebyside

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index 5751dfb8..191439ef 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,17 +30,24 @@
 class QTcpSocket;
 class QTimer;
 
+class AuthHandler;
+
 class RemotePeer : public Peer
 {
     Q_OBJECT
 
 public:
-    RemotePeer(QTcpSocket *socket, QObject *parent = 0);
-    virtual ~RemotePeer() {};
+    // import the virtuals from the baseclass
+    using Peer::handle;
+    using Peer::dispatch;
+
+    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
 
     void setSignalProxy(SignalProxy *proxy);
 
-    QString description() const;
+    virtual Protocol::Type protocol() const = 0;
+    virtual QString description() const;
+    virtual quint16 enabledFeatures() const { return 0; }
 
     bool isOpen() const;
     bool isSecure() const;
@@ -53,30 +60,28 @@ public:
 
     QTcpSocket *socket() const;
 
-    // this is only used for the auth phase and should be replaced by something more generic
-    virtual void writeSocketData(const QVariant &item) = 0;
-
 public slots:
     void close(const QString &reason = QString());
 
 signals:
-    // this is only used for the auth phase and should be replaced by something more generic
-    void dataReceived(const QVariant &item);
-
     void transferProgress(int current, int max);
+    void socketError(QAbstractSocket::SocketError error, const QString &errorString);
+    void statusMessage(const QString &msg);
 
 protected:
     SignalProxy *signalProxy() const;
 
-    template<class T>
-    void handle(const T &protoMessage);
-
     // 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;
 
+protected slots:
+    virtual void onSocketDataAvailable() = 0;
+    virtual void onSocketStateChanged(QAbstractSocket::SocketState state);
+    virtual void onSocketError(QAbstractSocket::SocketError error);
+
 private slots:
     void sendHeartBeat();
     void changeHeartBeatInterval(int secs);
@@ -89,12 +94,4 @@ private:
     int _lag;
 };
 
-
-template<class T> inline
-void RemotePeer::handle(const T &protoMessage)
-{
-    Peer::handle(protoMessage);
-}
-
-
 #endif