fixing pull / rebase aftermath

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index d7a14ff..c2f2425 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -226,9 +226,8 @@ QList<QRectF> ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity
   if(!haveLayout())
     updateLayout();
 
-  Q_ASSERT(_layout);
   foreach(int idx, indexList) {
-    QTextLine line = _layout->lineForTextPosition(idx);
+    QTextLine line = layout()->lineForTextPosition(idx);
     qreal x = line.cursorToX(idx);
     qreal width = line.cursorToX(idx + searchWord.count()) - x;
     qreal height = fontMetrics()->lineSpacing();

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 72d1fb6..44cbaaa 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -92,8 +92,6 @@ class ChatItem : public QGraphicsItem {
     int _col;
     quint8 _lines;
 
-    QTextLayout * _layout;
-
     enum SelectionMode { NoSelection, PartialSelection, FullSelection };
     SelectionMode _selectionMode;
     qint16 _selectionStart, _selectionEnd;