X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=f4016f5bbbdd4245701b0101ce2d5225edbfaadf;hp=e564b84f1baf92cca855a6fdb53621db5632f0f5;hb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56

diff --git a/src/common/message.cpp b/src/common/message.cpp
index e564b84f..f4016f5b 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-2013 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        *
@@ -15,88 +15,69 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "message.h"
-#include <QDataStream>
 
-/*
-Message Message::plain(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Plain, _text, _sender, _flags);
-}
+#include "util.h"
 
-Message Message::notice(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Notice, _text, _sender, _flags);
-}
-
-Message Message::action(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Action, _text, _sender, _flags);
-}
-
-Message Message::kick(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Kick, _text, _sender, _flags);
-}
-
-Message Message::join(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Join, _text, _sender, _flags);
-}
-
-Message Message::part(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Part, _text, _sender, _flags);
-}
+#include <QDataStream>
 
-Message Message::nick(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Nick, _text, _sender, _flags);
+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::mode(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Mode, _text, _sender, _flags);
-}
 
-Message Message::quit(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Quit, _text, _sender, _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)
+{
 }
 
-Message Message::kill(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Kill, _text, _sender, _flags);
-}
 
-Message Message::server(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Server, _text, _sender, _flags);
+QDataStream &operator<<(QDataStream &out, const Message &msg)
+{
+    out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
+    << msg.bufferInfo() << msg.sender().toUtf8() << msg.contents().toUtf8();
+    return out;
 }
 
-Message Message::info(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Info, _text, _sender, _flags);
-}
 
-Message Message::error(QString _target, QString _text, QString _sender, quint8 _flags) {
-  return Message(_target, Error, _text, _sender, _flags);
+QDataStream &operator>>(QDataStream &in, Message &msg)
+{
+    quint8 f;
+    quint32 t;
+    quint32 ts;
+    QByteArray s, 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;
 }
-*/
 
-QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  /*
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.target.toUtf8() << msg.sender.toUtf8() << msg.text.toUtf8();
-  */
-  out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
-      << msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
-  return out;
-}
 
-QDataStream &operator>>(QDataStream &in, Message &msg) {
-  quint8 t, f;
-  quint32 ts;
-  QByteArray s, m, targ;
-  BufferId buf;
-  in >> ts >> t >> f >> buf >> s >> m;
-  msg.type = (Message::Type)t;
-  msg.flags = (quint8)f;
-  msg.timeStamp = QDateTime::fromTime_t(ts);
-  //msg.target = QString::fromUtf8(targ);
-  msg.sender = QString::fromUtf8(s);
-  msg.text = 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;
 }
-