X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.h;h=623efa667467f81c99c05332cd38516838af4714;hp=0d540cd5f54f5089b76fa5cb02814187beb387ed;hb=1a128cd0ec1bb913e6d5fb4832834ba75abcfe32;hpb=ed9a0a3e6d1af81cc07a54d4feebb8a01c451fb8 diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h index 0d540cd5..623efa66 100644 --- a/src/client/messagemodel.h +++ b/src/client/messagemodel.h @@ -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, @@ -73,6 +75,7 @@ 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; @@ -139,7 +142,6 @@ public: static bool lessThan(const MessageModelItem *m1, const MessageModelItem *m2); private: - Message _msg; BufferId _redirectedTo; };