X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent.cpp;fp=src%2Fcommon%2Fevent.cpp;h=02d3f66722b8be84bb1a28b4a67c4e6d2635cf50;hp=7341b2d0fab1e66459266e020870fc422ab05db3;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/common/event.cpp b/src/common/event.cpp index 7341b2d0..02d3f667 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -20,18 +20,16 @@ #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) -{ -} - +{} -Event::Event(EventManager::EventType type, QVariantMap &map) +Event::Event(EventManager::EventType type, QVariantMap& map) : _type(type) { if (!map.contains("flags") || !map.contains("timestamp")) { @@ -43,18 +41,18 @@ Event::Event(EventManager::EventType type, QVariantMap &map) Q_ASSERT(SignalProxy::current()); Q_ASSERT(SignalProxy::current()->sourcePeer()); - setFlags(static_cast(map.take("flags").toInt())); // TODO sanity check? + setFlags(static_cast(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 { + } + 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()); @@ -64,12 +62,12 @@ void Event::toVariantMap(QVariantMap &map) const if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) { // toMSecs returns a qint64, signed rather than unsigned map["timestamp"] = timestamp().toMSecsSinceEpoch(); - } else { + } + else { map["timestamp"] = timestamp().toTime_t(); } } - QVariantMap Event::toVariantMap() const { QVariantMap map; @@ -77,8 +75,7 @@ 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 @@ -93,7 +90,7 @@ Event *Event::fromVariantMap(QVariantMap &map, Network *network) auto group = static_cast(type & EventManager::EventGroupMask); - Event *e = nullptr; + Event* e = nullptr; // we use static create() functions to keep group-specific special cases in the files they belong // e.g. IrcEventRawMessage @@ -129,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(); }