Switch some dirty hacking to using real infrastructure. A Chatline now contains three...

[quassel.git] / src / qtui / chatlinemodelitem.cpp

diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 807d40c..4e1eb47 100644 (file)
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -26,13 +26,13 @@
 ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg) {
   QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg);
 
-  _timestamp.plainText = m.timestamp.text;
-  _sender.plainText = m.sender.text;
-  _contents.plainText = m.text.text;
+  _timestamp.plainText = m.timestamp.plainText;
+  _sender.plainText = m.sender.plainText;
+  _contents.plainText = m.contents.plainText;
 
-  _timestamp.formatList = m.timestamp.formats;
-  _sender.formatList = m.sender.formats;
-  _contents.formatList = m.text.formats;
+  _timestamp.formatList = m.timestamp.formatList;
+  _sender.formatList = m.sender.formatList;
+  _contents.formatList = m.contents.formatList;
 
 }
 
@@ -43,7 +43,7 @@ QVariant ChatlineModelItem::data(int column, int role) const {
   switch(column) {
     case ChatlineModel::TimestampColumn: part = &_timestamp; break;
     case ChatlineModel::SenderColumn:    part = &_sender; break;
-    case ChatlineModel::TextColumn:      part = &_contents; break;
+    case ChatlineModel::ContentsColumn:      part = &_contents; break;
     default: return MessageModelItem::data(column, role);
   }