X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeer.h;h=ce5851d6ac45d20c79994e93067b3d5933ffc4e9;hp=c77c6bfa297505d90441f1181f5ca7a675e34115;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/common/peer.h b/src/common/peer.h
index c77c6bfa..ce5851d6 100644
--- a/src/common/peer.h
+++ b/src/common/peer.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  *
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "common-export.h"
+
 #include <QAbstractSocket>
 #include <QDataStream>
 #include <QPointer>
@@ -29,27 +31,27 @@
 #include "quassel.h"
 #include "signalproxy.h"
 
-class Peer : public QObject
+class COMMON_EXPORT Peer : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit Peer(AuthHandler *authHandler, QObject *parent = 0);
+    explicit Peer(AuthHandler* authHandler, QObject* parent = nullptr);
 
     virtual Protocol::Type protocol() const = 0;
     virtual QString description() const = 0;
 
-    virtual SignalProxy *signalProxy() const = 0;
-    virtual void setSignalProxy(SignalProxy *proxy) = 0;
+    virtual SignalProxy* signalProxy() const = 0;
+    virtual void setSignalProxy(SignalProxy* proxy) = 0;
 
     QDateTime connectedSince() const;
-    void setConnectedSince(const QDateTime &connectedSince);
+    void setConnectedSince(const QDateTime& connectedSince);
 
     QString buildDate() const;
-    void setBuildDate(const QString &buildDate);
+    void setBuildDate(const QString& buildDate);
 
     QString clientVersion() const;
-    void setClientVersion(const QString &clientVersion);
+    void setClientVersion(const QString& clientVersion);
 
     bool hasFeature(Quassel::Feature feature) const;
     Quassel::Features features() const;
@@ -58,7 +60,7 @@ public:
     int id() const;
     void setId(int id);
 
-    AuthHandler *authHandler() const;
+    AuthHandler* authHandler() const;
 
     virtual bool isOpen() const = 0;
     virtual bool isSecure() const = 0;
@@ -71,24 +73,24 @@ public:
 
 public slots:
     /* Handshake messages */
-    virtual void dispatch(const Protocol::RegisterClient &) = 0;
-    virtual void dispatch(const Protocol::ClientDenied &) = 0;
-    virtual void dispatch(const Protocol::ClientRegistered &) = 0;
-    virtual void dispatch(const Protocol::SetupData &) = 0;
-    virtual void dispatch(const Protocol::SetupFailed &) = 0;
-    virtual void dispatch(const Protocol::SetupDone &) = 0;
-    virtual void dispatch(const Protocol::Login &) = 0;
-    virtual void dispatch(const Protocol::LoginFailed &) = 0;
-    virtual void dispatch(const Protocol::LoginSuccess &) = 0;
-    virtual void dispatch(const Protocol::SessionState &) = 0;
+    virtual void dispatch(const Protocol::RegisterClient&) = 0;
+    virtual void dispatch(const Protocol::ClientDenied&) = 0;
+    virtual void dispatch(const Protocol::ClientRegistered&) = 0;
+    virtual void dispatch(const Protocol::SetupData&) = 0;
+    virtual void dispatch(const Protocol::SetupFailed&) = 0;
+    virtual void dispatch(const Protocol::SetupDone&) = 0;
+    virtual void dispatch(const Protocol::Login&) = 0;
+    virtual void dispatch(const Protocol::LoginFailed&) = 0;
+    virtual void dispatch(const Protocol::LoginSuccess&) = 0;
+    virtual void dispatch(const Protocol::SessionState&) = 0;
 
     /* Sigproxy messages */
-    virtual void dispatch(const Protocol::SyncMessage &) = 0;
-    virtual void dispatch(const Protocol::RpcCall &) = 0;
-    virtual void dispatch(const Protocol::InitRequest &) = 0;
-    virtual void dispatch(const Protocol::InitData &) = 0;
+    virtual void dispatch(const Protocol::SyncMessage&) = 0;
+    virtual void dispatch(const Protocol::RpcCall&) = 0;
+    virtual void dispatch(const Protocol::InitRequest&) = 0;
+    virtual void dispatch(const Protocol::InitData&) = 0;
 
-    virtual void close(const QString &reason = QString()) = 0;
+    virtual void close(const QString& reason = QString()) = 0;
 
 signals:
     void disconnected();
@@ -97,7 +99,7 @@ signals:
 
 protected:
     template<typename T>
-    void handle(const T &protoMessage);
+    void handle(const T& protoMessage);
 
 private:
     QPointer<AuthHandler> _authHandler;
@@ -112,36 +114,35 @@ private:
 };
 
 // We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
-typedef Peer * PeerPtr;
+using PeerPtr = Peer*;
 Q_DECLARE_METATYPE(PeerPtr)
 
-QDataStream &operator<<(QDataStream &out, PeerPtr ptr);
-QDataStream &operator>>(QDataStream &in, PeerPtr &ptr);
-
+QDataStream& operator<<(QDataStream& out, PeerPtr ptr);
+QDataStream& operator>>(QDataStream& in, PeerPtr& ptr);
 
 // Template method needed in the header
-template<typename T> inline
-void Peer::handle(const T &protoMessage)
+template<typename T>
+inline void Peer::handle(const T& protoMessage)
 {
-    switch(protoMessage.handler()) {
-        case Protocol::Handler::SignalProxy:
-            if (!signalProxy()) {
-                qWarning() << Q_FUNC_INFO << "Cannot handle message without a SignalProxy!";
-                return;
-            }
-            signalProxy()->handle(this, protoMessage);
-            break;
-
-        case Protocol::Handler::AuthHandler:
-            if (!authHandler()) {
-                qWarning() << Q_FUNC_INFO << "Cannot handle auth messages without an active AuthHandler!";
-                return;
-            }
-            authHandler()->handle(protoMessage);
-            break;
-
-        default:
-            qWarning() << Q_FUNC_INFO << "Unknown handler for protocol message!";
+    switch (protoMessage.handler()) {
+    case Protocol::Handler::SignalProxy:
+        if (!signalProxy()) {
+            qWarning() << Q_FUNC_INFO << "Cannot handle message without a SignalProxy!";
             return;
+        }
+        signalProxy()->handle(this, protoMessage);
+        break;
+
+    case Protocol::Handler::AuthHandler:
+        if (!authHandler()) {
+            qWarning() << Q_FUNC_INFO << "Cannot handle auth messages without an active AuthHandler!";
+            return;
+        }
+        authHandler()->handle(protoMessage);
+        break;
+
+    default:
+        qWarning() << Q_FUNC_INFO << "Unknown handler for protocol message!";
+        return;
     }
 }