Correctly render timestamp and sender as well

[quassel.git] / src / qtui / chatitem.h

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index f3c261a..73e1806 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -50,28 +50,20 @@ class ChatItem : public QGraphicsItem {
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
     virtual QVariant data(int role) const;
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
     virtual QVariant data(int role) const;

-    //QString text() const;
-    //void setText(const UiStyle::StyledText &text);
-
-    //QTextOption textOption() const;
-    //void setTextOption(const QTextOption &option);

 
     // returns height
     int setWidth(int width);
 
     // returns height
     int setWidth(int width);

-    //virtual void layout();

 
   protected:
     //void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
 
   private:
     int heightForWidth(int width);
 
   protected:
     //void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
 
   private:
     int heightForWidth(int width);

-    QTextLayout *createLayout();
+    QTextLayout *createLayout(QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft);

 
     QRectF _boundingRect;
     QFontMetricsF *_fontMetrics;
     quint8 _lines;
 
     QRectF _boundingRect;
     QFontMetricsF *_fontMetrics;
     quint8 _lines;

-    //QTextLayout _layout;
-    //QTextOption _textOption;

     QPersistentModelIndex _index;
 
     QTextLayout *_layout;
     QPersistentModelIndex _index;
 
     QTextLayout *_layout;


@@ -85,12 +77,12 @@ class ChatItem::WrapColumnFinder {
     WrapColumnFinder(ChatItem *parent);
     ~WrapColumnFinder();
 
     WrapColumnFinder(ChatItem *parent);
     ~WrapColumnFinder();
 

-    int nextWrapColumn(QTextLine &line);
+    int nextWrapColumn();

 
   private:
     ChatItem *item;
     QTextLayout *layout;
 
   private:
     ChatItem *item;
     QTextLayout *layout;

-    QTextLine *line;
+    QTextLine line;

     ChatLineModel::WrapList wrapList;
     int wordidx;
     int lastwrapcol;
     ChatLineModel::WrapList wrapList;
     int wordidx;
     int lastwrapcol;