X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=02fc8740e6b7e8b86257df72867c22dfd5a6cc99;hp=7297f4b21f43f1ce70bdb41ea22ee6f0a52a2ac9;hb=3258b69cab16d7a5cf80a27d166c0a3628fe60d2;hpb=722de35940fadb7be9cde29e103d251742ffb3ec

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 7297f4b2..02fc8740 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -103,7 +103,7 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
   int start = indexForId(msglist.first().msgId());
   int end = start + msglist.count() - 1;
   MessageModelItem *dayChangeItem = 0;
-
+  bool relocatedMsg = false;
   if(start > 0) {
     // check if the preceeding msg is a daychange message and if so if
     // we have to drop or relocate it at the end of this chunk
@@ -122,6 +122,7 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
       endRemoveRows();
       start--;
       end--;
+      relocatedMsg = true;
     }
   }
 
@@ -150,7 +151,14 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
     end++;
 
   Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < msglist.first().msgId());
+
+  if(start < _messageList.count()) { // && _messageList[start]->msgId() <= msglist.last().msgId()) {
+    qDebug() << *(_messageList[start]) << "<=" << msglist.last();
+    qDebug() << start << end << msglist.count() << dayChangeItem << relocatedMsg;
+  }
   Q_ASSERT(start == _messageList.count() || _messageList[start]->msgId() > msglist.last().msgId());
+
+
   beginInsertRows(QModelIndex(), start, end);
   int pos = start;
   foreach(Message msg, msglist) {
@@ -372,3 +380,12 @@ bool MessageModelItem::operator==(const MessageModelItem &other) const {
 bool MessageModelItem::operator>(const MessageModelItem &other) const {
   return _msgId > other._msgId;
 }
+
+QDebug operator<<(QDebug dbg, const MessageModelItem &msgItem) {
+  dbg.nospace() << qPrintable(QString("MessageModelItem(MsgId:")) << msgItem.msgId()
+		<< qPrintable(QString(",")) << msgItem.timeStamp()
+		<< qPrintable(QString(", Type:")) << msgItem.msgType()
+		<< qPrintable(QString(", Flags:")) << msgItem.msgFlags() << qPrintable(QString(")"))
+		<< msgItem.data(1, Qt::DisplayRole).toString() << ":" << msgItem.data(2, Qt::DisplayRole).toString();
+  return dbg;
+}