projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better abstraction of BacklogRequester to support different requesting methods
[quassel.git]
/
src
/
common
/
message.h
diff --git
a/src/common/message.h
b/src/common/message.h
index
baa8846
..
4d283ad
100644
(file)
--- a/
src/common/message.h
+++ b/
src/common/message.h
@@
-1,11
+1,11
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by The Quassel IRC Development Team
*
+ * Copyright (C) 2005-0
8 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 *
* 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 *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@
-18,51
+18,88
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef
_
MESSAGE_H_
-#define
_
MESSAGE_H_
+#ifndef MESSAGE_H_
+#define MESSAGE_H_
#include <QString>
#include <QDateTime>
#include <QString>
#include <QDateTime>
-#include "global.h"
+#include "bufferinfo.h"
+#include "types.h"
class Message {
class Message {
+ Q_DECLARE_TR_FUNCTIONS(Message)
- public:
- /** The different types a message can have for display */
- enum Type { Plain, Notice, Action, Nick, Mode, Join, Part, Quit, Kick, Kill, Server, Info, Error };
- enum Flags { None = 0, Self = 1, PrivMsg = 2, Highlight = 4 };
+public:
+ /** The different types a message can have for display */
+ enum Type {
+ Plain = 0x0001,
+ Notice = 0x0002,
+ Action = 0x0004,
+ Nick = 0x0008,
+ Mode = 0x0010,
+ Join = 0x0020,
+ Part = 0x0040,
+ Quit = 0x0080,
+ Kick = 0x0100,
+ Kill = 0x0200,
+ Server = 0x0400,
+ Info = 0x0800,
+ Error = 0x1000,
+ DayChange = 0x2000
+ };
- Message(BufferId buffer = BufferId(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+ // DO NOT CHANGE without knowing what you do, some of these flags are stored in the database
+ enum Flag {
+ None = 0x00,
+ Self = 0x01,
+ Highlight = 0x02,
+ Redirected = 0x04,
+ Backlog = 0x80
+ };
+ Q_DECLARE_FLAGS(Flags, Flag)
- Message(QDateTime ts, BufferId buffer = BufferId(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
- MsgId msgId() const;
- void setMsgId(MsgId id);
+ Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = "", const QString &sender = "", Flags flags = None);
+ Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain,
+ const QString &contents = "", const QString &sender = "", Flags flags = None);
- BufferId buffer() const;
- QString text() const;
- QString sender() const;
- Type type() const;
- quint8 flags() const;
- QDateTime timeStamp() const;
+ inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange, tr("Day changed to %1").arg(day.toString("dddd MMMM d yyyy"))); }
+ inline MsgId msgId() const { return _msgId; }
+ inline void setMsgId(MsgId id) { _msgId = id; }
- private:
- QDateTime _timeStamp;
- MsgId _msgId;
- BufferId _buffer;
- QString _text;
- QString _sender;
- Type _type;
- quint8 _flags;
+ inline BufferInfo bufferInfo() const { return _bufferInfo; }
+ inline QString contents() const { return _contents; }
+ inline QString sender() const { return _sender; }
+ inline Type type() const { return _type; }
+ inline Flags flags() const { return _flags; }
+ inline QDateTime timestamp() const { return _timestamp; }
-
friend QDataStream &operator>>(QDataStream &in, Message &msg
);
+
void setFlags(Flags flags
);
+ inline bool operator<(const Message &other) const { return _msgId < other._msgId; }
+
+private:
+ QDateTime _timestamp;
+ MsgId _msgId;
+ BufferInfo _bufferInfo;
+ QString _contents;
+ QString _sender;
+ Type _type;
+ Flags _flags;
+
+ QString _formattedTimestamp, _formattedSender, _formattedText; // cache
+
+ friend QDataStream &operator>>(QDataStream &in, Message &msg);
};
};
+typedef QList<Message> MessageList;
+
QDataStream &operator<<(QDataStream &out, const Message &msg);
QDataStream &operator>>(QDataStream &in, Message &msg);
QDataStream &operator<<(QDataStream &out, const Message &msg);
QDataStream &operator>>(QDataStream &in, Message &msg);
+QDebug operator<<(QDebug dbg, const Message &msg);
-Q_DECLARE_METATYPE(Message);
+Q_DECLARE_METATYPE(Message)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags)
#endif
#endif