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

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index b65fbbfa..2439d1e0 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,10 +34,12 @@ class MessageModel : public QAbstractItemModel {
   Q_OBJECT
 
 public:
-  enum MessageRole {
+  enum MessageModelRole {
     DisplayRole = Qt::DisplayRole,
     EditRole = Qt::EditRole,
-    MsgIdRole = Qt::UserRole,
+    BackgroundRole = Qt::BackgroundRole,
+    MessageRole = Qt::UserRole,
+    MsgIdRole,
     BufferIdRole,
     TypeRole,
     FlagsRole,
@@ -54,9 +56,9 @@ public:
 
   MessageModel(QObject *parent);
 
-  inline QModelIndex index(int row, int column, const QModelIndex &/*parent*/ = QModelIndex()) const { return createIndex(row, column); }
+  inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
   inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
-  inline int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : _messageList.count(); }
+  inline int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : messageCount(); }
   inline int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 3; }
 
   virtual QVariant data(const QModelIndex &index, int role) const;
@@ -69,13 +71,32 @@ public:
 
   void clear();
 
+signals:
+  void finishedBacklogFetch(BufferId bufferId);
+
 public slots:
   void requestBacklog(BufferId bufferId);
   void messagesReceived(BufferId bufferId, int count);
   void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
+  void insertErrorMessage(BufferInfo bufferInfo, const QString &errorString);
 
 protected:
-  virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
+//   virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
+
+  virtual int messageCount() const = 0;
+  virtual bool messagesIsEmpty() const = 0;
+  virtual const MessageModelItem *messageItemAt(int i) const = 0;
+  virtual MessageModelItem *messageItemAt(int i) = 0;
+  virtual const MessageModelItem *firstMessageItem() const= 0;
+  virtual MessageModelItem *firstMessageItem() = 0;
+  virtual const MessageModelItem *lastMessageItem() const= 0;
+  virtual MessageModelItem *lastMessageItem() = 0;
+  virtual void insertMessage__(int pos, const Message &) = 0;
+  virtual void insertMessages__(int pos, const QList<Message> &) = 0;
+  virtual void removeMessageAt(int i) = 0;
+  virtual void removeAllMessages() = 0;
+  virtual Message takeMessageAt(int i) = 0;
+
   virtual void customEvent(QEvent *event);
 
 private slots:
@@ -86,13 +107,21 @@ private:
   int insertMessagesGracefully(const QList<Message> &); // inserts as many contiguous msgs as possible. returns numer of inserted msgs.
   int indexForId(MsgId);
 
-  QList<MessageModelItem *> _messageList;
+  //  QList<MessageModelItem *> _messageList;
   QList<Message> _messageBuffer;
   QTimer _dayChangeTimer;
   QDateTime _nextDayChange;
   QHash<BufferId, int> _messagesWaiting;
 };
 
+// inlines
+QModelIndex MessageModel::index(int row, int column, const QModelIndex &parent) const {
+  if(row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent))
+    return QModelIndex();
+
+  return createIndex(row, column);
+}
+
 // **************************************************
 //  MessageModelItem
 // **************************************************
@@ -103,19 +132,20 @@ public:
    *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
    *  strings without formattings (e.g. for searching purposes).
    */
-  MessageModelItem(const Message &);
+  MessageModelItem() {}
   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; }
-  
+  virtual const Message &message() const = 0;
+  virtual const QDateTime &timestamp() const = 0;
+  virtual const MsgId &msgId() const = 0;
+  virtual const BufferId &bufferId() const = 0;
+  virtual void setBufferId(BufferId bufferId) = 0;
+  virtual Message::Type msgType() const = 0;
+  virtual Message::Flags msgFlags() const = 0;
+
   // For sorting
   bool operator<(const MessageModelItem &) const;
   bool operator==(const MessageModelItem &) const;
@@ -123,12 +153,7 @@ public:
   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);