X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.h;h=cecd0121d83eb32555f0f6cc913a11c839665ec9;hp=840184d7023c8e5447af878a09e3a8d1dcc524c9;hb=11c8e2a97cc6b52cad3910d2d58677d9a9f28206;hpb=4d30b647a451ad697806c9988744247777feca32

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 840184d7..cecd0121 100644
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -24,22 +24,22 @@
 #include <QGraphicsItem>
 #include <QObject>
 
-#include "chatline.h"
 #include "chatlinemodel.h"
 #include "chatscene.h"
 #include "uistyle.h"
+#include "qtui.h"
 
 class QTextLayout;
 
 class ChatItem : public QGraphicsItem {
 
   public:
-    ChatItem(const QPersistentModelIndex &index, QGraphicsItem *parent);
+    ChatItem(int col, QAbstractItemModel *, QGraphicsItem *parent);
     virtual ~ChatItem();
 
-    inline QPersistentModelIndex index() const { return _index; }
-    inline const MessageModel *model() const { return _index.isValid() ? qobject_cast<const MessageModel *>(_index.model()) : 0; }
-    inline int row() const { return _index.isValid() ? _index.row() : 0; }
+    inline const QAbstractItemModel *model() const { return chatScene() ? chatScene()->model() : 0; }
+    int row() const;
+    inline int column() const { return _col; }
     inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }
 
     inline QFontMetricsF *fontMetrics() const { return _fontMetrics; }
@@ -55,7 +55,7 @@ class ChatItem : public QGraphicsItem {
     virtual QVariant data(int role) const;
 
     // returns height
-    qreal setWidth(qreal width);
+    qreal setGeometry(qreal width, qreal height = -1);
 
     // selection stuff, to be called by the scene
     void clearSelection();
@@ -82,8 +82,8 @@ class ChatItem : public QGraphicsItem {
 
     QRectF _boundingRect;
     QFontMetricsF *_fontMetrics;
+    int _col;
     quint8 _lines;
-    QPersistentModelIndex _index;
 
     QTextLayout * _layout;
     QList<quint16> _wrapPositions;
@@ -113,4 +113,8 @@ class ChatItem::WrapColumnFinder {
     qreal w;
 };
 
+#include "chatline.h"
+inline int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }
+
+
 #endif