Add a flag to enable Qt deprecation warnings on Qt < 5.13

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 5a05f02..cfa04e3 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -32,6 +32,7 @@
 #include "coreignorelistmanager.h"
 #include "coreinfo.h"
 #include "message.h"
+#include "metricsserver.h"
 #include "peer.h"
 #include "protocol.h"
 #include "storage.h"
@@ -279,6 +280,7 @@ private:
     bool _processMessages;
     CoreIgnoreListManager _ignoreListManager;
     CoreHighlightRuleManager _highlightRuleManager;
+    MetricsServer* _metricsServer{nullptr};
 };
 
 struct NetworkInternalMessage
@@ -289,7 +291,12 @@ struct NetworkInternalMessage
     QString text;
     QString sender;
     Message::Flags flags;
-    NetworkInternalMessage(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender = "", Message::Flags flags = Message::None)
+    NetworkInternalMessage(Message::Type type,
+                           BufferInfo::Type bufferType,
+                           QString target,
+                           QString text,
+                           QString sender = "",
+                           Message::Flags flags = Message::None)
         : type(type)
         , bufferType(bufferType)
         , target(std::move(target))
@@ -301,6 +308,7 @@ struct NetworkInternalMessage
 
 struct RawMessage
 {
+    QDateTime timestamp;
     NetworkId networkId;
     Message::Type type;
     BufferInfo::Type bufferType;
@@ -308,9 +316,17 @@ struct RawMessage
     QString text;
     QString sender;
     Message::Flags flags;
-    RawMessage(
-        NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, Message::Flags flags)
-        : networkId(networkId)
+
+    RawMessage(QDateTime timestamp,
+               NetworkId networkId,
+               Message::Type type,
+               BufferInfo::Type bufferType,
+               QString target,
+               QString text,
+               QString sender,
+               Message::Flags flags)
+        : timestamp(std::move(timestamp))
+        , networkId(networkId)
         , type(type)
         , bufferType(bufferType)
         , target(std::move(target))
@@ -319,8 +335,10 @@ struct RawMessage
         , flags(flags)
     {}
 
-    RawMessage(NetworkId networkId, const NetworkInternalMessage& msg)
-        : networkId(networkId)
+    RawMessage(NetworkId networkId,
+               const NetworkInternalMessage& msg)
+        : timestamp(QDateTime::currentDateTimeUtc())
+        , networkId(networkId)
         , type(msg.type)
         , bufferType(msg.bufferType)
         , target(msg.target)