Cleanup

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 993a76f..66fee92 100644 (file)
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -41,157 +41,171 @@ typedef struct {
 class ChatLineModelItemPrivate {
 
 public:
-  inline ChatLineModelItemPrivate(const Message &msg) : _msgBuffer(new Message(msg)), _styledMsg(0) {}
-  ~ChatLineModelItemPrivate() {
-    if(_msgBuffer) {
-      delete _msgBuffer;
-    } else {
-      delete _styledMsg;
-    }
-  }
+  inline ChatLineModelItemPrivate(const Message &msg);
+  ~ChatLineModelItemPrivate();
 
-  inline bool needsStyling() { return (bool)_msgBuffer; }
-
-  QVariant data(MessageModel::ColumnType column, int role) {
-    if(needsStyling())
-      style();
-    switch(column) {
-      case ChatLineModel::TimestampColumn:
-        switch(role) {
-          case ChatLineModel::DisplayRole:
-            return _styledMsg->decoratedTimestamp();
-          case ChatLineModel::EditRole:
-            return _styledMsg->timestamp();
-          case ChatLineModel::FormatRole:
-            return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
-                                      << qMakePair((quint16)0, (quint32)_styledMsg->timestampFormat()));
-        }
-        break;
-      case ChatLineModel::SenderColumn:
-        switch(role) {
-          case ChatLineModel::DisplayRole:
-            return _styledMsg->decoratedSender();
-          case ChatLineModel::EditRole:
-            return _styledMsg->sender();
-          case ChatLineModel::FormatRole:
-            return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
-                                      << qMakePair((quint16)0, (quint32)_styledMsg->senderFormat()));
-        }
-        break;
-      case ChatLineModel::ContentsColumn:
-        switch(role) {
-          case ChatLineModel::DisplayRole:
-          case ChatLineModel::EditRole:
-            return _styledMsg->contents();
-          case ChatLineModel::FormatRole:
-            return QVariant::fromValue<UiStyle::FormatList>(_styledMsg->contentsFormatList());
-          case ChatLineModel::WrapListRole:
-            if(_wrapList.isEmpty())
-              computeWrapList();
-            return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
-        }
-        break;
-      default:
-        Q_ASSERT(false);
-        return 0;
-    }
-    return QVariant();
-  }
+  inline bool needsStyling();
+  QVariant data(MessageModel::ColumnType column, int role);
 
 private:
-  void style() {
-    _styledMsg = new QtUiStyle::StyledMessage(QtUi::style()->styleMessage(*_msgBuffer));
+  void style();
+  void computeWrapList();
+
+  ChatLineModel::WrapList _wrapList;
+  Message *_msgBuffer;
+  UiStyle::StyledMessage *_styledMsg;
+
+  static unsigned char *TextBoundaryFinderBuffer;
+  static int TextBoundaryFinderBufferSize;
+};
+
+ChatLineModelItemPrivate::ChatLineModelItemPrivate(const Message &msg)
+: _msgBuffer(new Message(msg)),
+  _styledMsg(0) {
+
+}
 
+ChatLineModelItemPrivate::~ChatLineModelItemPrivate() {
+  if(_msgBuffer) {
     delete _msgBuffer;
-    _msgBuffer = 0;
+  } else {
+    delete _styledMsg;
   }
+}
 
-  void computeWrapList() {
-    int length = _styledMsg->contents().length();
-    if(!length)
-      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, _styledMsg->contents().unicode(), length,
-                               TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize);
-
-    int idx;
-    int oldidx = 0;
-    bool wordStart = false;
-    bool wordEnd = false;
-    Mode mode = SearchEnd;
-    ChatLineModel::Word word;
-    word.start = 0;
-    qreal wordstartx = 0;
-
-    QTextLayout layout(_styledMsg->contents());
-    QTextOption option;
-    option.setWrapMode(QTextOption::NoWrap);
-    layout.setTextOption(option);
-
-    layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_styledMsg->contentsFormatList(), length));
-    layout.beginLayout();
-    QTextLine line = layout.createLine();
-    line.setNumColumns(length);
-    layout.endLayout();
-
-    do {
-      idx = finder.toNextBoundary();
-      if(idx < 0) {
-        idx = length;
-        wordStart = false;
-        wordEnd = false;
-        mode = SearchStart;
-      } else {
-        wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
-        wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
-      }
-
-      //if(flg) qDebug() << idx << mode << wordStart << wordEnd << contents->plainText.left(idx) << contents->plainText.mid(idx);
+bool ChatLineModelItemPrivate::needsStyling() {
+  return (bool)_msgBuffer;
+}
 
-      if(mode == SearchEnd || (!wordStart && wordEnd)) {
-        if(wordStart || !wordEnd) continue;
-        oldidx = idx;
-        mode = SearchStart;
-        continue;
+QVariant ChatLineModelItemPrivate::data(MessageModel::ColumnType column, int role) {
+  if(needsStyling())
+    style();
+  switch(column) {
+    case ChatLineModel::TimestampColumn:
+      switch(role) {
+        case ChatLineModel::DisplayRole:
+          return _styledMsg->decoratedTimestamp();
+        case ChatLineModel::EditRole:
+          return _styledMsg->timestamp();
+        case ChatLineModel::FormatRole:
+          return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
+                                    << qMakePair((quint16)0, (quint32)_styledMsg->timestampFormat()));
       }
-      qreal wordendx = line.cursorToX(oldidx);
-      qreal trailingendx = line.cursorToX(idx);
-      word.endX = wordendx;
-      word.width = wordendx - wordstartx;
-      word.trailing = trailingendx - wordendx;
-      wordstartx = trailingendx;
-      wplist.append(word);
-
-      if(wordStart) {
-        word.start = idx;
-        mode = SearchEnd;
+      break;
+    case ChatLineModel::SenderColumn:
+      switch(role) {
+        case ChatLineModel::DisplayRole:
+          return _styledMsg->decoratedSender();
+        case ChatLineModel::EditRole:
+          return _styledMsg->sender();
+        case ChatLineModel::FormatRole:
+          return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
+                                    << qMakePair((quint16)0, (quint32)_styledMsg->senderFormat()));
       }
-      // the part " || (finder.position() == contents->plainText.length())" shouldn't be necessary
-      // but in rare and indeterministic cases Qt states that the end of the text is not a boundary o_O
-    } while(finder.isAtBoundary() || (finder.position() == length));
-
-    // A QVector needs less space than a QList
-    _wrapList.resize(wplist.count());
-    for(int i = 0; i < wplist.count(); i++) {
-      _wrapList[i] = wplist.at(i);
-    }
+      break;
+    case ChatLineModel::ContentsColumn:
+      switch(role) {
+        case ChatLineModel::DisplayRole:
+        case ChatLineModel::EditRole:
+          return _styledMsg->contents();
+        case ChatLineModel::FormatRole:
+          return QVariant::fromValue<UiStyle::FormatList>(_styledMsg->contentsFormatList());
+        case ChatLineModel::WrapListRole:
+          if(_wrapList.isEmpty())
+            computeWrapList();
+          return QVariant::fromValue<ChatLineModel::WrapList>(_wrapList);
+      }
+      break;
+    default:
+      Q_ASSERT(false);
+      return 0;
   }
+  return QVariant();
+}
 
-  ChatLineModel::WrapList _wrapList;
-  Message *_msgBuffer;
-  UiStyle::StyledMessage *_styledMsg;
+void ChatLineModelItemPrivate::style() {
+  _styledMsg = new QtUiStyle::StyledMessage(QtUi::style()->styleMessage(*_msgBuffer));
+  delete _msgBuffer;
+  _msgBuffer = 0;
+}
 
-  static unsigned char *TextBoundaryFinderBuffer;
-  static int TextBoundaryFinderBufferSize;
-};
+void ChatLineModelItemPrivate::computeWrapList() {
+  int length = _styledMsg->contents().length();
+  if(!length)
+    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, _styledMsg->contents().unicode(), length,
+                              TextBoundaryFinderBuffer, TextBoundaryFinderBufferSize);
+
+  int idx;
+  int oldidx = 0;
+  bool wordStart = false;
+  bool wordEnd = false;
+  Mode mode = SearchEnd;
+  ChatLineModel::Word word;
+  word.start = 0;
+  qreal wordstartx = 0;
+
+  QTextLayout layout(_styledMsg->contents());
+  QTextOption option;
+  option.setWrapMode(QTextOption::NoWrap);
+  layout.setTextOption(option);
+
+  layout.setAdditionalFormats(QtUi::style()->toTextLayoutList(_styledMsg->contentsFormatList(), length));
+  layout.beginLayout();
+  QTextLine line = layout.createLine();
+  line.setNumColumns(length);
+  layout.endLayout();
+
+  do {
+    idx = finder.toNextBoundary();
+    if(idx < 0) {
+      idx = length;
+      wordStart = false;
+      wordEnd = false;
+      mode = SearchStart;
+    } else {
+      wordStart = finder.boundaryReasons().testFlag(QTextBoundaryFinder::StartWord);
+      wordEnd = finder.boundaryReasons().testFlag(QTextBoundaryFinder::EndWord);
+    }
+
+    //if(flg) qDebug() << idx << mode << wordStart << wordEnd << contents->plainText.left(idx) << contents->plainText.mid(idx);
+
+    if(mode == SearchEnd || (!wordStart && wordEnd)) {
+      if(wordStart || !wordEnd) continue;
+      oldidx = idx;
+      mode = SearchStart;
+      continue;
+    }
+    qreal wordendx = line.cursorToX(oldidx);
+    qreal trailingendx = line.cursorToX(idx);
+    word.endX = wordendx;
+    word.width = wordendx - wordstartx;
+    word.trailing = trailingendx - wordendx;
+    wordstartx = trailingendx;
+    wplist.append(word);
+
+    if(wordStart) {
+      word.start = idx;
+      mode = SearchEnd;
+    }
+    // the part " || (finder.position() == contents->plainText.length())" shouldn't be necessary
+    // but in rare and indeterministic cases Qt states that the end of the text is not a boundary o_O
+  } while(finder.isAtBoundary() || (finder.position() == length));
+
+  // A QVector needs less space than a QList
+  _wrapList.resize(wplist.count());
+  for(int i = 0; i < wplist.count(); i++) {
+    _wrapList[i] = wplist.at(i);
+  }
+}
 
 unsigned char *ChatLineModelItemPrivate::TextBoundaryFinderBuffer = (unsigned char *)malloc(512 * sizeof(HB_CharAttributes_Dummy));
 int ChatLineModelItemPrivate::TextBoundaryFinderBufferSize = 512 * (sizeof(HB_CharAttributes_Dummy) / sizeof(unsigned char));
 
-
 // ****************************************
 // the actual ChatLineModelItem
 // ****************************************