projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes
[quassel.git]
/
src
/
common
/
message.h
diff --git
a/src/common/message.h
b/src/common/message.h
index
17f5493
..
08c70c6
100644
(file)
--- a/
src/common/message.h
+++ b/
src/common/message.h
@@
-33,25
+33,26
@@
class Message {
public:
/** The different types a message can have for display */
enum Type {
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
+ 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
};
enum Flags {
None = 0,
Self = 1,
};
enum Flags {
None = 0,
Self = 1,
- Highlight = 2
+ Highlight = 2,
+ Redirected = 4
};
Q_DECLARE_FLAGS(MessageFlags, Flags)
};
Q_DECLARE_FLAGS(MessageFlags, Flags)
@@
-78,6
+79,9
@@
public:
//static QString formattedToHtml(const QString &);
//static QString formattedToHtml(const QString &);
+ /** Convert mIRC control codes to our own */
+ static QString mircToInternal(QString);
+
void format();
private:
void format();
private:
@@
-91,8
+95,6
@@
private:
QString _formattedTimestamp, _formattedSender, _formattedText; // cache
QString _formattedTimestamp, _formattedSender, _formattedText; // cache
- /** Convert mIRC control codes to our own */
- QString mircToInternal(QString);
friend QDataStream &operator>>(QDataStream &in, Message &msg);
};
friend QDataStream &operator>>(QDataStream &in, Message &msg);
};