X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.h;h=623efa667467f81c99c05332cd38516838af4714;hp=afb8ec30da66a69d6c7269a092e4997abcff454d;hb=1a128cd0ec1bb913e6d5fb4832834ba75abcfe32;hpb=27302bba72a29977e81b9a0b2d8cde3a62ebc818

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index afb8ec30..623efa66 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -34,11 +34,12 @@ class MessageModel : public QAbstractItemModel {
   Q_OBJECT
 
 public:
-  enum MessageRole {
+  enum MessageModelRole {
     DisplayRole = Qt::DisplayRole,
     EditRole = Qt::EditRole,
     BackgroundRole = Qt::BackgroundRole,
-    MsgIdRole = Qt::UserRole,
+    MessageRole = Qt::UserRole,
+    MsgIdRole,
     BufferIdRole,
     TypeRole,
     FlagsRole,
@@ -70,8 +71,6 @@ public:
 
   void clear();
 
-  virtual const MessageModelItem *messageItemAt(int i) const = 0;
-
 public slots:
   void requestBacklog(BufferId bufferId);
   void messagesReceived(BufferId bufferId, int count);
@@ -83,6 +82,7 @@ protected:
 
   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;
@@ -142,7 +142,6 @@ public:
   static bool lessThan(const MessageModelItem *m1, const MessageModelItem *m2);
 
 private:
-  Message _msg;
   BufferId _redirectedTo;
 };