X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessageevent.cpp;h=606103e9e526e1cdd08839cebebab792002da0c8;hb=6f38b6fdeb73e726c24b26a97b98c9cfe0fc8a0e;hp=d7f3b7c910ee73faa28d7f6b60d61b2cce926234;hpb=6097f67231950c4c22845735db8b997a844fec48;p=quassel.git

diff --git a/src/common/messageevent.cpp b/src/common/messageevent.cpp
index d7f3b7c9..606103e9 100644
--- a/src/common/messageevent.cpp
+++ b/src/common/messageevent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,13 +20,21 @@
 
 #include "messageevent.h"
 
+Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) {
+  if(type == EventManager::MessageEvent)
+    return new MessageEvent(type, map, network);
 
-MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &msg, const QString &target, const QString &sender, Message::Flags flags)
+  return 0;
+}
+
+
+MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &msg, const QString &sender, const QString &target,
+                           Message::Flags flags, const QDateTime &timestamp)
     : NetworkEvent(EventManager::MessageEvent, net),
       _msgType(msgType),
       _text(msg),
-      _target(target),
       _sender(sender),
+      _target(target),
       _msgFlags(flags)
 {
   IrcChannel *channel = network()->ircChannel(_target);
@@ -39,8 +47,37 @@ MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &m
   }
 
   _bufferType = bufferTypeByTarget(_target);
+
+  if(timestamp.isValid())
+    setTimestamp(timestamp);
+  else
+    setTimestamp(QDateTime::currentDateTime());
+}
+
+
+MessageEvent::MessageEvent(EventManager::EventType type, QVariantMap &map, Network *network)
+  : NetworkEvent(type, map, network)
+{
+  _msgType = static_cast<Message::Type>(map.take("messageType").toInt());
+  _msgFlags = static_cast<Message::Flags>(map.take("messageFlags").toInt());
+  _bufferType = static_cast<BufferInfo::Type>(map.take("bufferType").toInt());
+  _text = map.take("text").toString();
+  _sender = map.take("sender").toString();
+  _target = map.take("target").toString();
 }
 
+
+void MessageEvent::toVariantMap(QVariantMap &map) const {
+  NetworkEvent::toVariantMap(map);
+  map["messageType"] = msgType();
+  map["messageFlags"] = (int)msgFlags();
+  map["bufferType"] = bufferType();
+  map["text"] = text();
+  map["sender"] = sender();
+  map["target"] = target();
+}
+
+
 BufferInfo::Type MessageEvent::bufferTypeByTarget(const QString &target) const {
   if(target.isEmpty())
     return BufferInfo::StatusBuffer;