X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.h;h=b65fbbfad2c13caaff21f76d98c022c6328b54ad;hp=71c1c8124da48e6e215c0602cb644a0fb378b5cd;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=e28ac2cd72a6be486f9f11d2a526f32ffea061b9

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index 71c1c812..b65fbbfa 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -33,72 +33,104 @@ struct MsgId;
 class MessageModel : public QAbstractItemModel {
   Q_OBJECT
 
-  public:
-    enum MessageRole {
-      MsgIdRole = Qt::UserRole,
-      BufferIdRole,
-      TypeRole,
-      FlagsRole,
-      TimestampRole,
-      DisplayRole,
-      FormatRole,
-      ColumnTypeRole,
-      UserRole
-    };
-
-    enum ColumnType {
-      TimestampColumn, SenderColumn, ContentsColumn, UserColumnType
-    };
-
-    MessageModel(QObject *parent);
-    virtual ~MessageModel();
-
-    inline QModelIndex index(int row, int column, const QModelIndex &/*parent*/ = QModelIndex()) const { return createIndex(row, column); }
-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
-    inline int rowCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return _messageList.count(); }
-    inline int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 3; }
-
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
-
-    //virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-
-    void insertMessage(const Message &);
-    void insertMessages(const QList<Message> &);
-
-    void clear();
-
-  protected:
-    virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
-
-  private:
-    QList<MessageModelItem *> _messageList;
-
-    int indexForId(MsgId);
-
+public:
+  enum MessageRole {
+    DisplayRole = Qt::DisplayRole,
+    EditRole = Qt::EditRole,
+    MsgIdRole = Qt::UserRole,
+    BufferIdRole,
+    TypeRole,
+    FlagsRole,
+    TimestampRole,
+    FormatRole,
+    ColumnTypeRole,
+    RedirectedToRole,
+    UserRole
+  };
+
+  enum ColumnType {
+    TimestampColumn, SenderColumn, ContentsColumn, UserColumnType
+  };
+
+  MessageModel(QObject *parent);
+
+  inline QModelIndex index(int row, int column, const QModelIndex &/*parent*/ = QModelIndex()) const { return createIndex(row, column); }
+  inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
+  inline int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : _messageList.count(); }
+  inline int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 3; }
+
+  virtual QVariant data(const QModelIndex &index, int role) const;
+  virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
+
+  //virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+
+  bool insertMessage(const Message &, bool fakeMsg = false);
+  void insertMessages(const QList<Message> &);
+
+  void clear();
+
+public slots:
+  void requestBacklog(BufferId bufferId);
+  void messagesReceived(BufferId bufferId, int count);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
+
+protected:
+  virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
+  virtual void customEvent(QEvent *event);
+
+private slots:
+  void changeOfDay();
+
+private:
+  void insertMessageGroup(const QList<Message> &);
+  int insertMessagesGracefully(const QList<Message> &); // inserts as many contiguous msgs as possible. returns numer of inserted msgs.
+  int indexForId(MsgId);
+
+  QList<MessageModelItem *> _messageList;
+  QList<Message> _messageBuffer;
+  QTimer _dayChangeTimer;
+  QDateTime _nextDayChange;
+  QHash<BufferId, int> _messagesWaiting;
 };
 
+// **************************************************
+//  MessageModelItem
+// **************************************************
 class MessageModelItem {
-
-  public:
-
-    //! Creates a MessageModelItem from a Message object.
-    /** This baseclass implementation takes care of all Message data *except* the stylable strings.
-     *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
-     *  strings without formattings (e.g. for searching purposes).
-     */
-    MessageModelItem(const Message &);
-    virtual ~MessageModelItem();
-
-    virtual QVariant data(int column, int role) const;
-    virtual bool setData(int column, const QVariant &value, int role) = 0;
-
-  private:
-    QDateTime _timestamp;
-    MsgId _msgId;
-    BufferId _bufferId;
-    Message::Type _type;
-    Message::Flags _flags;
+public:
+  //! Creates a MessageModelItem from a Message object.
+  /** This baseclass implementation takes care of all Message data *except* the stylable strings.
+   *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
+   *  strings without formattings (e.g. for searching purposes).
+   */
+  MessageModelItem(const Message &);
+  inline virtual ~MessageModelItem() {}
+
+  virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
+  inline const QDateTime &timeStamp() const { return _timestamp; }
+  inline MsgId msgId() const { return _msgId; }
+  inline BufferId bufferId() const { return _bufferId; }
+  inline void setBufferId(BufferId bufferId) { _bufferId = bufferId; }
+  inline Message::Type msgType() const { return _type; }
+  inline Message::Flags msgFlags() const { return _flags; }
+  
+  // For sorting
+  bool operator<(const MessageModelItem &) const;
+  bool operator==(const MessageModelItem &) const;
+  bool operator>(const MessageModelItem &) const;
+  static bool lessThan(const MessageModelItem *m1, const MessageModelItem *m2);
+
+private:
+  QDateTime _timestamp;
+  MsgId _msgId;
+  BufferId _bufferId;
+  BufferId _redirectedTo;
+  Message::Type _type;
+  Message::Flags _flags;
 };
 
+QDebug operator<<(QDebug dbg, const MessageModelItem &msgItem);
+
 #endif