X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=c867a7cbc2a9283178393723e766679035a970c2;hp=837dc35a593922b7ae2dc3d43e00bccea8dbcc52;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=2039f5e28eeb431e394f1c2468a26218bd926538

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 837dc35a..c867a7cb 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -19,26 +19,58 @@
  ***************************************************************************/
 
 #include "message.h"
+
+#include "util.h"
+
 #include <QDataStream>
 
+Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
+  : _timestamp(QDateTime::currentDateTime().toUTC()),
+    _bufferInfo(bufferInfo),
+    _contents(contents),
+    _sender(sender),
+    _type(type),
+    _flags(flags)
+{
+}
+
+Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
+  : _timestamp(ts),
+    _bufferInfo(bufferInfo),
+    _contents(contents),
+    _sender(sender),
+    _type(type),
+    _flags(flags)
+{
+}
+
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
+  out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
+      << msg.bufferInfo() << msg.sender().toUtf8() << msg.contents().toUtf8();
   return out;
 }
 
 QDataStream &operator>>(QDataStream &in, Message &msg) {
-  quint8 t, f;
+  quint8 f;
+  quint32 t;
   quint32 ts;
   QByteArray s, m;
-  BufferId buf;
-  in >> ts >> t >> f >> buf >> s >> m;
-  msg.type = (Message::Type)t;
-  msg.flags = (quint8)f;
-  msg.buffer = buf;
-  msg.timeStamp = QDateTime::fromTime_t(ts);
-  msg.sender = QString::fromUtf8(s);
-  msg.text = QString::fromUtf8(m);
+  BufferInfo buf;
+  in >> msg._msgId >> ts >> t >> f >> buf >> s >> m;
+  msg._type = (Message::Type)t;
+  msg._flags = (Message::Flags)f;
+  msg._bufferInfo = buf;
+  msg._timestamp = QDateTime::fromTime_t(ts);
+  msg._sender = QString::fromUtf8(s);
+  msg._contents = QString::fromUtf8(m);
   return in;
 }
 
+QDebug operator<<(QDebug dbg, const Message &msg) {
+  dbg.nospace() << qPrintable(QString("Message(MsgId:")) << msg.msgId()
+	      << qPrintable(QString(",")) << msg.timestamp()
+	      << qPrintable(QString(", Type:")) << msg.type()
+	      << qPrintable(QString(", Flags:")) << msg.flags() << qPrintable(QString(")"))
+	      << msg.sender() << ":" << msg.contents();
+  return dbg;
+}