X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent.cpp;h=8f255d115a922de62135e044c829e0379749a8af;hp=4b916e54a73cda0cd73dc0f36848543f8a1adb39;hb=579e559a6322209df7cd51c34801fecff5fe734b;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 4b916e54..8f255d11 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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,19 +20,17 @@
 
 #include "ctcpevent.h"
 #include "ircevent.h"
-#include "networkevent.h"
 #include "messageevent.h"
+#include "networkevent.h"
+#include "peer.h"
+#include "signalproxy.h"
 
 Event::Event(EventManager::EventType type)
     : _type(type)
-    , _valid(true)
-{
-}
+{}
 
-
-Event::Event(EventManager::EventType type, QVariantMap &map)
+Event::Event(EventManager::EventType type, QVariantMap& map)
     : _type(type)
-    , _valid(true)
 {
     if (!map.contains("flags") || !map.contains("timestamp")) {
         qWarning() << "Received invalid serialized event:" << map;
@@ -40,19 +38,36 @@ Event::Event(EventManager::EventType type, QVariantMap &map)
         return;
     }
 
-    setFlags(static_cast<EventManager::EventFlags>(map.take("flags").toInt())); // TODO sanity check?
-    setTimestamp(QDateTime::fromTime_t(map.take("timestamp").toUInt()));
-}
+    Q_ASSERT(SignalProxy::current());
+    Q_ASSERT(SignalProxy::current()->sourcePeer());
 
+    setFlags(static_cast<EventManager::EventFlags>(map.take("flags").toInt()));  // TODO sanity check?
+
+    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongTime)) {
+        // timestamp is a qint64, signed rather than unsigned
+        setTimestamp(QDateTime::fromMSecsSinceEpoch(map.take("timestamp").toLongLong()));
+    }
+    else {
+        setTimestamp(QDateTime::fromTime_t(map.take("timestamp").toUInt()));
+    }
+}
 
-void Event::toVariantMap(QVariantMap &map) const
+void Event::toVariantMap(QVariantMap& map) const
 {
+    Q_ASSERT(SignalProxy::current());
+    Q_ASSERT(SignalProxy::current()->targetPeer());
+
     map["type"] = static_cast<int>(type());
     map["flags"] = static_cast<int>(flags());
-    map["timestamp"] = timestamp().toTime_t();
+    if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) {
+        // toMSecs returns a qint64, signed rather than unsigned
+        map["timestamp"] = timestamp().toMSecsSinceEpoch();
+    }
+    else {
+        map["timestamp"] = timestamp().toTime_t();
+    }
 }
 
-
 QVariantMap Event::toVariantMap() const
 {
     QVariantMap map;
@@ -60,23 +75,22 @@ QVariantMap Event::toVariantMap() const
     return map;
 }
 
-
-Event *Event::fromVariantMap(QVariantMap &map, Network *network)
+Event* Event::fromVariantMap(QVariantMap& map, Network* network)
 {
     int inttype = map.take("type").toInt();
     // sanity check if we have a valid enum value
     if (EventManager::enumName(inttype).isEmpty()) {
         qWarning() << "Received a serialized event with unknown type" << inttype;
-        return 0;
+        return nullptr;
     }
 
-    EventManager::EventType type = static_cast<EventManager::EventType>(inttype);
+    auto type = static_cast<EventManager::EventType>(inttype);
     if (type == EventManager::Invalid || type == EventManager::GenericEvent)
-        return 0;
+        return nullptr;
 
-    EventManager::EventType group = static_cast<EventManager::EventType>(type & EventManager::EventGroupMask);
+    auto group = static_cast<EventManager::EventType>(type & EventManager::EventGroupMask);
 
-    Event *e = 0;
+    Event* e = nullptr;
 
     // we use static create() functions to keep group-specific special cases in the files they belong
     // e.g. IrcEventRawMessage
@@ -102,7 +116,7 @@ Event *Event::fromVariantMap(QVariantMap &map, Network *network)
 
     if (!e) {
         qWarning() << "Can't create event of type" << type;
-        return 0;
+        return nullptr;
     }
 
     if (!map.isEmpty()) {
@@ -112,14 +126,12 @@ Event *Event::fromVariantMap(QVariantMap &map, Network *network)
     return e;
 }
 
-
-QDebug operator<<(QDebug dbg, Event *e)
+QDebug operator<<(QDebug dbg, Event* e)
 {
     dbg.nospace() << qPrintable(e->className()) << "("
-    << "type = 0x" << qPrintable(QString::number(e->type(), 16));
+                  << "type = 0x" << qPrintable(QString::number(e->type(), 16));
     e->debugInfo(dbg);
     //<< ", data = " << e->data(); // we don't use data anywhere yet
-    dbg.nospace() << ", flags = 0x" << qPrintable(QString::number(e->flags(), 16))
-    << ")";
+    dbg.nospace() << ", flags = 0x" << qPrintable(QString::number(e->flags(), 16)) << ")";
     return dbg.space();
 }