topic changes are now handled properly

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

diff --git a/src/qtui/chatwidget.h b/src/qtui/chatwidget.h
index 0bd51ca..801203c 100644 (file)
--- a/src/qtui/chatwidget.h
+++ b/src/qtui/chatwidget.h
@@ -23,7 +23,9 @@
 
 #include <QtGui>
 
-class ChatLine;
+#include "types.h"
+
+class ChatLineOld;
 class AbstractUiMsg;
 
 //!\brief Scroll area showing part of the chat messages for a given buffer.
@@ -43,8 +45,9 @@ class ChatWidget : public QAbstractScrollArea {
   public:
     ChatWidget(QWidget *parent = 0);
     ~ChatWidget();
-    void init(QString net, QString buf);
+    void init(BufferId id);
 
+    virtual QSize minimumSizeHint() const;
     virtual QSize sizeHint() const;
 
   public slots:
@@ -53,11 +56,11 @@ class ChatWidget : public QAbstractScrollArea {
     void prependMsg(AbstractUiMsg *);
     void appendMsg(AbstractUiMsg *);
 
-    void prependChatLine(ChatLine *);
-    void appendChatLine(ChatLine *);
-    void prependChatLines(QList<ChatLine *>);
-    void appendChatLines(QList<ChatLine *>);
-    void setContents(QList<ChatLine *>);
+    void prependChatLine(ChatLineOld *);
+    void appendChatLine(ChatLineOld *);
+    void prependChatLines(QList<ChatLineOld *>);
+    void appendChatLines(QList<ChatLineOld *>);
+    void setContents(QList<ChatLineOld *>);
 
   protected:
     virtual void resizeEvent(QResizeEvent *event);
@@ -75,7 +78,7 @@ class ChatWidget : public QAbstractScrollArea {
     void handleScrollTimer();
 
   private:
-    QString networkName, bufferName;
+    BufferId bufferId;
     enum SelectionMode { NoSelection, TextSelected, LinesSelected };
     enum MouseMode { Normal, Pressed, DragTsSep, DragTextSep, MarkText, MarkLines };
     enum MousePos { None, OverTsSep, OverTextSep, OverUrl };
@@ -92,7 +95,7 @@ class ChatWidget : public QAbstractScrollArea {
 
     int bottomLine, bottomLineOffset;
 
-    QList<ChatLine *> lines;
+    QList<ChatLineOld *> lines;
     QList<qreal> ycoords;
     QTimer *scrollTimer;
     QPoint pointerPosition;