X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.cpp;h=1897e3e1b495dd246db6b853907879804c997a72;hp=9b9e71c2c75ebaff1d0eaf4539c2aee7bf719df7;hb=e2953de106e68e72486e294405f4bdcd33c60fba;hpb=c06d3ebf3abc0f098d6262e9bd9dd98d90edc136

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 9b9e71c2..1897e3e1 100644
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -40,8 +40,13 @@ typedef struct {
 unsigned char *ChatLineModelItem::TextBoundaryFinderBuffer = (unsigned char *)malloc(512 * sizeof(HB_CharAttributes_Dummy));
 int ChatLineModelItem::TextBoundaryFinderBufferSize = 512 * (sizeof(HB_CharAttributes_Dummy) / sizeof(unsigned char));
 
+struct ChatLineModelItemPrivate {
+  ChatLineModel::WrapList wrapList;
+};
+
 ChatLineModelItem::ChatLineModelItem(const Message &msg)
-  : MessageModelItem(msg)
+  : MessageModelItem(msg),
+    _data(new ChatLineModelItemPrivate)
 {
   QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg);
 
@@ -52,11 +57,8 @@ ChatLineModelItem::ChatLineModelItem(const Message &msg)
   _timestamp.formatList = m.timestamp.formatList;
   _sender.formatList = m.sender.formatList;
   _contents.formatList = m.contents.formatList;
-
-  computeWrapList();
 }
 
-
 QVariant ChatLineModelItem::data(int column, int role) const {
   const ChatLinePart *part = 0;
 
@@ -82,19 +84,20 @@ QVariant ChatLineModelItem::data(int column, int role) const {
   case ChatLineModel::WrapListRole:
     if(column != ChatLineModel::ContentsColumn)
       return QVariant();
-    return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
+    if(_data->wrapList.isEmpty())
+      computeWrapList();
+    return QVariant::fromValue<ChatLineModel::WrapList>(_data->wrapList);
   }
   return MessageModelItem::data(column, role);
 }
 
-void ChatLineModelItem::computeWrapList() {
+void ChatLineModelItem::computeWrapList() const {
   if(_contents.plainText.isEmpty())
     return;
 
   enum Mode { SearchStart, SearchEnd };
 
   QList<ChatLineModel::Word> wplist;  // use a temp list which we'll later copy into a QVector for efficiency
-  // QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText);
   QTextBoundaryFinder finder(QTextBoundaryFinder::Word, _contents.plainText.unicode(), _contents.plainText.length(), TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize);
 
   int idx;
@@ -153,9 +156,9 @@ void ChatLineModelItem::computeWrapList() {
   } while(finder.isAtBoundary() || (finder.position() == _contents.plainText.length()));
 
   // A QVector needs less space than a QList
-  _wrapList.resize(wplist.count());
+  _data->wrapList.resize(wplist.count());
   for(int i = 0; i < wplist.count(); i++) {
-    _wrapList[i] = wplist.at(i);
+    _data->wrapList[i] = wplist.at(i);
   }
 }