X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fpeer.h;h=803f15b52c2b814ebb2507d49bf1d0d1f5db0d76;hb=158443f71d48215eea8b47b836b61afd77654b78;hp=6b824cfd2a2c57f02d4c5f4ea4d9ffc4468d4879;hpb=28cee4568aeb1ce3014d11234e40f19e7aeae5bd;p=quassel.git

diff --git a/src/common/peer.h b/src/common/peer.h
index 6b824cfd..803f15b5 100644
--- a/src/common/peer.h
+++ b/src/common/peer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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 PEER_H
-#define PEER_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QAbstractSocket>
 #include <QDataStream>
@@ -27,14 +28,15 @@
 
 #include "authhandler.h"
 #include "protocol.h"
+#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;
@@ -42,15 +44,19 @@ public:
     virtual SignalProxy *signalProxy() const = 0;
     virtual void setSignalProxy(SignalProxy *proxy) = 0;
 
-    const QDateTime &connectedSince() const;
+    QDateTime connectedSince() const;
     void setConnectedSince(const QDateTime &connectedSince);
 
-    const QString &buildDate() const;
+    QString buildDate() const;
     void setBuildDate(const QString &buildDate);
 
-    const QString &clientVersion() const;
+    QString clientVersion() const;
     void setClientVersion(const QString &clientVersion);
 
+    bool hasFeature(Quassel::Feature feature) const;
+    Quassel::Features features() const;
+    void setFeatures(Quassel::Features features);
+
     int id() const;
     void setId(int id);
 
@@ -102,12 +108,13 @@ private:
 
     QString _buildDate;
     QString _clientVersion;
+    Quassel::Features _features;
 
     int _id = -1;
 };
 
 // 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);
@@ -119,7 +126,7 @@ template<typename T> inline
 void Peer::handle(const T &protoMessage)
 {
     switch(protoMessage.handler()) {
-        case Protocol::SignalProxy:
+        case Protocol::Handler::SignalProxy:
             if (!signalProxy()) {
                 qWarning() << Q_FUNC_INFO << "Cannot handle message without a SignalProxy!";
                 return;
@@ -127,7 +134,7 @@ void Peer::handle(const T &protoMessage)
             signalProxy()->handle(this, protoMessage);
             break;
 
-        case Protocol::AuthHandler:
+        case Protocol::Handler::AuthHandler:
             if (!authHandler()) {
                 qWarning() << Q_FUNC_INFO << "Cannot handle auth messages without an active AuthHandler!";
                 return;
@@ -140,5 +147,3 @@ void Peer::handle(const T &protoMessage)
             return;
     }
 }
-
-#endif