X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.h;h=5382a7b85de4554c6553f972f87745d88b6631c0;hp=a2ef9b9aec879f13d096c15f40b747f4696636e7;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=ce4dc5d6d32af97589c15529f67f15218c381488

diff --git a/src/qtui/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h
index a2ef9b9a..5382a7b8 100644
--- a/src/qtui/chatlinemodelitem.h
+++ b/src/qtui/chatlinemodelitem.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,9 +21,8 @@
 #ifndef CHATLINEMODELITEM_H_
 #define CHATLINEMODELITEM_H_
 
-#include <QVector>
+#include "messagemodel.h"
 
-#include "chatlinemodel.h"
 #include "uistyle.h"
 
 class ChatLineModelItem : public MessageModelItem {
@@ -31,18 +30,33 @@ public:
   ChatLineModelItem(const Message &);
 
   virtual QVariant data(int column, int role) const;
-  virtual inline bool setData(int column, const QVariant &value, int role) { return false; }
 
-private:
-  void computeWrapList();
+  virtual inline const Message &message() const { return _styledMsg; }
+  virtual inline const QDateTime &timestamp() const { return _styledMsg.timestamp(); }
+  virtual inline const MsgId &msgId() const { return _styledMsg.msgId(); }
+  virtual inline const BufferId &bufferId() const { return _styledMsg.bufferId(); }
+  virtual inline void setBufferId(BufferId bufferId) { _styledMsg.setBufferId(bufferId); }
+  virtual inline Message::Type msgType() const { return _styledMsg.type(); }
+  virtual inline Message::Flags msgFlags() const { return _styledMsg.flags(); }
 
-  struct ChatLinePart {
-    QString plainText;
-    UiStyle::FormatList formatList;
+  /// Used to store information about words to be used for wrapping
+  struct Word {
+    quint16 start;
+    qreal endX;
+    qreal width;
+    qreal trailing;
   };
-  ChatLinePart _timestamp, _sender, _contents;
+  typedef QVector<Word> WrapList;
+
+private:
+  virtual QVariant timestampData(int role) const;
+  virtual QVariant senderData(int role) const;
+  virtual QVariant contentsData(int role) const;
+
+  void computeWrapList() const;
 
-  ChatLineModel::WrapList _wrapList;
+  mutable WrapList _wrapList;
+  UiStyle::StyledMessage _styledMsg;
 
   static unsigned char *TextBoundaryFinderBuffer;
   static int TextBoundaryFinderBufferSize;