projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
damn... now it's fixed...
[quassel.git]
/
src
/
common
/
message.h
diff --git
a/src/common/message.h
b/src/common/message.h
index
baa8846
..
17f5493
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 *
@@
-24,45
+24,83
@@
#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,
+ Notice,
+ Action,
+ Nick,
+ Mode,
+ Join,
+ Part,
+ Quit,
+ Kick,
+ Kill,
+ Server,
+ Info,
+ Error
+ };
- Message(BufferId buffer = BufferId(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+ enum Flags {
+ None = 0,
+ Self = 1,
+ Highlight = 2
+ };
+ Q_DECLARE_FLAGS(MessageFlags, Flags)
+
-
Message(QDateTime ts, BufferId buffer = BufferId
(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+
Message(BufferInfo bufferInfo = BufferInfo
(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
- MsgId msgId() const;
- void setMsgId(MsgId id);
+ Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
- BufferId buffer() const;
- QString text() const;
- QString sender() const;
- Type type() const;
- quint8 flags() const;
- QDateTime timeStamp() const;
+ 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 text() const { return _text; }
+ inline QString sender() const { return _sender; }
+ inline Type type() const { return _type; }
+ inline quint8 flags() const { return _flags; }
+ inline QDateTime timestamp() const { return _timestamp; }
- friend QDataStream &operator>>(QDataStream &in, Message &msg);
+ void setFlags(quint8 flags);
+
+ QString formattedTimestamp();
+ QString formattedSender();
+ QString formattedText();
+ //static QString formattedToHtml(const QString &);
+
+ void format();
+
+private:
+ QDateTime _timestamp;
+ MsgId _msgId;
+ BufferInfo _bufferInfo;
+ QString _text;
+ QString _sender;
+ Type _type;
+ quint8 _flags;
+
+ QString _formattedTimestamp, _formattedSender, _formattedText; // cache
+
+ /** Convert mIRC control codes to our own */
+ QString mircToInternal(QString);
+
+ friend QDataStream &operator>>(QDataStream &in, Message &msg);
};
QDataStream &operator<<(QDataStream &out, const Message &msg);
QDataStream &operator>>(QDataStream &in, Message &msg);
Q_DECLARE_METATYPE(Message);
};
QDataStream &operator<<(QDataStream &out, const Message &msg);
QDataStream &operator>>(QDataStream &in, Message &msg);
Q_DECLARE_METATYPE(Message);
+Q_DECLARE_OPERATORS_FOR_FLAGS(Message::MessageFlags)
#endif
#endif