projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "fixing BR #264 (core crash after join)"
[quassel.git]
/
src
/
qtui
/
chatlinemodelitem.h
diff --git
a/src/qtui/chatlinemodelitem.h
b/src/qtui/chatlinemodelitem.h
index
24fed2b
..
a4df520
100644
(file)
--- a/
src/qtui/chatlinemodelitem.h
+++ b/
src/qtui/chatlinemodelitem.h
@@
-24,12
+24,13
@@
#include <QVector>
#include <QPair>
#include <QVector>
#include <QPair>
-#include "
messag
emodel.h"
+#include "
chatlin
emodel.h"
#include "uistyle.h"
class ChatLineModelItem : public MessageModelItem {
public:
#include "uistyle.h"
class ChatLineModelItem : public MessageModelItem {
public:
+
ChatLineModelItem(const Message &);
//virtual ~ChatLineModelItem() {};
ChatLineModelItem(const Message &);
//virtual ~ChatLineModelItem() {};
@@
-37,7
+38,7
@@
class ChatLineModelItem : public MessageModelItem {
virtual bool setData(int column, const QVariant &value, int role);
private:
virtual bool setData(int column, const QVariant &value, int role);
private:
- void computeW
ord
List();
+ void computeW
rap
List();
struct ChatLinePart {
QString plainText;
struct ChatLinePart {
QString plainText;
@@
-45,7
+46,7
@@
class ChatLineModelItem : public MessageModelItem {
};
ChatLinePart _timestamp, _sender, _contents;
};
ChatLinePart _timestamp, _sender, _contents;
-
QVector<QPair<quint16, quint16> > _word
List;
+
ChatLineModel::WrapList _wrap
List;
};
#endif
};
#endif