X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.h;h=5b2786aacdb7050d8baaa7ddc84eb6f0b07b79e4;hp=afbe89f55db0152536c8fd70ff02e73f93aceee8;hb=0b9f74984780aacbe85ca04c44ec6304c86557c2;hpb=32b5e6447458a8e6e8074c40988b2d06f327094f

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index afbe89f5..5b2786aa 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -27,7 +27,7 @@
 #include "message.h"
 #include "types.h"
 
-class MessageItem;
+class MessageModelItem;
 class MsgId;
 
 class MessageModel : public QAbstractItemModel {
@@ -46,7 +46,7 @@ class MessageModel : public QAbstractItemModel {
     };
 
     enum ColumnType {
-      TimestampColumn, SenderColumn, TextColumn, UserColumnType
+      TimestampColumn, SenderColumn, ContentsColumn, UserColumnType
     };
 
     MessageModel(QObject *parent);
@@ -66,26 +66,26 @@ class MessageModel : public QAbstractItemModel {
     void insertMessages(const QList<Message> &);
 
   protected:
-    virtual MessageItem *createMessageItem(const Message &) = 0;
+    virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
 
   private:
-    QList<MessageItem *> _messageList;
+    QList<MessageModelItem *> _messageList;
 
     int indexForId(MsgId);
 
 };
 
-class MessageItem {
+class MessageModelItem {
 
   public:
 
-    //! Creates a MessageItem from a Message object.
+    //! 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).
      */
-    MessageItem(const Message &);
-    virtual ~MessageItem();
+    MessageModelItem(const Message &);
+    virtual ~MessageModelItem();
 
     virtual QVariant data(int column, int role) const;
     virtual bool setData(int column, const QVariant &value, int role) = 0;