X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=4032c649df496e3fb02adad3883f40ae0a55fa74;hp=6784c4fed6e6c1e287517da59a5c1bc23eb6fdda;hb=bd37d2c94e49e791d2ba44baab4270e030442832;hpb=0b9f74984780aacbe85ca04c44ec6304c86557c2

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 6784c4fe..4032c649 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -23,19 +23,20 @@
 #include "message.h"
 
 MessageModel::MessageModel(QObject *parent) : QAbstractItemModel(parent) {
-  
-  
-  
+
+
+
 }
 
 MessageModel::~MessageModel() {
-  
-  
+
+
 }
 
 QVariant MessageModel::data(const QModelIndex &index, int role) const {
-  int row = index.row();
-  if(row < 0 || row >= _messageList.count()) return QVariant();
+  int row = index.row(); int column = index.column();
+  if(row < 0 || row >= _messageList.count() || column < 0) return QVariant();
+  if(role == ColumnTypeRole) return column;
   return _messageList[row]->data(index.column(), role);
 }
 
@@ -65,6 +66,12 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
 
 }
 
+void MessageModel::clear() {
+  reset();
+  qDeleteAll(_messageList);
+  _messageList.clear();
+}
+
 // returns index of msg with given Id or of the next message after that (i.e., the index where we'd insert this msg)
 int MessageModel::indexForId(MsgId id) {
   if(_messageList.isEmpty() || id <= _messageList[0]->data(0, MsgIdRole).value<MsgId>()) return 0;