Fixing a client crash that could be triggered under certain preconditions if a ircUse...

[quassel.git] / src / qtopia / chatwidget.cpp

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index d676df4..b6950c6 100644 (file)
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -22,14 +22,16 @@
 #include <QtGui>
 #include "chatwidget.h"
 
-ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
+ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent), AbstractChatView() {
   setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
   setTextInteractionFlags(Qt::TextBrowserInteraction);
 }
 
-void ChatWidget::setContents(QList<ChatLine *> lines) {
+void ChatWidget::setContents(const QList<AbstractUiMsg *> &lines) {
   clear();
-  appendChatLines(lines);
+  QList<ChatLine *> list;
+  foreach(AbstractUiMsg *msg, lines) list << static_cast<ChatLine*>(msg);
+  appendChatLines(list);
 
 }
 
@@ -51,7 +53,7 @@ void ChatWidget::appendChatLine(ChatLine *line) {
   if(!document()->isEmpty()) insertPlainText("\n");
   insertStyledText(line->styledSender());
   insertPlainText(" ");
-  insertStyledText(line->styledText());
+  insertStyledText(line->styledContents());
   setTextCursor(cursor);
 }
 
@@ -67,7 +69,7 @@ void ChatWidget::prependChatLine(ChatLine *line) {
   bool flg = document()->isEmpty();
   insertStyledText(line->styledSender());
   insertPlainText(" ");
-  insertStyledText(line->styledText());
+  insertStyledText(line->styledContents());
   if(!flg) insertPlainText("\n");
   setTextCursor(cursor);
 }
@@ -82,14 +84,14 @@ void ChatWidget::insertChatLine(ChatLine *line) {
   if(!document()->isEmpty()) insertPlainText("\n");
   insertStyledText(line->styledSender());
   insertPlainText(" ");
-  insertStyledText(line->styledText());
+  insertStyledText(line->styledContents());
 }
 
 void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
   QTextCursor cursor = textCursor();
-  foreach(QTextLayout::FormatRange format, stext.formats) {
+  foreach(QTextLayout::FormatRange format, stext.formatList) {
     cursor.setCharFormat(format.format);
     setTextCursor(cursor);
-    insertPlainText(stext.text.mid(format.start, format.length));
+    insertPlainText(stext.plainText.mid(format.start, format.length));
   }
 }