Ok this is the major rework of quassel we've all been waiting for. For the actual...

[quassel.git] / src / qtgui / chatline.h

diff --git a/src/qtgui/chatline.h b/src/qtgui/chatline.h
index b42982c..2707a17 100644 (file)
--- a/src/qtgui/chatline.h
+++ b/src/qtgui/chatline.h
@@ -59,7 +59,7 @@ class ChatLine : public QObject, public AbstractUiMsg {
     QString sender() const;
     QString text() const;
     MsgId msgId() const;
-    BufferId bufferId() const;
+    BufferInfo bufferInfo() const;
 
     bool isUrl(int pos) const;
     QUrl getUrl(int pos) const;
@@ -70,7 +70,7 @@ class ChatLine : public QObject, public AbstractUiMsg {
     qreal hght;
     Message msg;
     qreal tsWidth, senderWidth, textWidth;
-    Style::FormattedString tsFormatted, senderFormatted, textFormatted;
+    Style::StyledString styledTimeStamp, styledSender, styledText;
 
     struct FormatRange {
       int start;
@@ -103,7 +103,7 @@ class ChatLine : public QObject, public AbstractUiMsg {
     int selectionStart, selectionEnd;
     void formatMsg(Message);
     void precomputeLine();
-    QList<FormatRange> calcFormatRanges(const Style::FormattedString &, QTextLayout::FormatRange additional = QTextLayout::FormatRange());
+    QList<FormatRange> calcFormatRanges(const Style::StyledString &, QTextLayout::FormatRange additional = QTextLayout::FormatRange());
 };
 
 #endif