introducing query merging (per drag & drop). needs a core update

[quassel.git] / src / client / messagemodel.cpp

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 8dfaf01..945ac7d 100644 (file)
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -370,7 +370,7 @@ void MessageModel::requestBacklog(BufferId bufferId) {
                                                      .arg(requestCount)
                                                      .arg(Client::networkModel()->networkName(bufferId))
                                                      .arg(Client::networkModel()->bufferName(bufferId)));
-      Client::backlogManager()->requestBacklog(bufferId, requestCount, _messageList.at(i)->msgId().toInt());
+      Client::backlogManager()->requestBacklog(bufferId, -1, _messageList.at(i)->msgId(), requestCount);
       return;
     }
   }
@@ -385,6 +385,16 @@ void MessageModel::messagesReceived(BufferId bufferId, int count) {
     _messagesWaiting.remove(bufferId);
 }
 
+void MessageModel::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2) {
+  for(int i = 0; i < _messageList.count(); i++) {
+    if(_messageList[i]->bufferId() == bufferId2) {
+      _messageList[i]->setBufferId(bufferId1);
+      QModelIndex idx = index(i, 0);
+      emit dataChanged(idx, idx);
+    }
+  }
+}
+
 // ========================================
 //  MessageModelItem
 // ========================================
@@ -426,7 +436,6 @@ bool MessageModelItem::setData(int column, const QVariant &value, int role) {
   }
 }
 
-
 // Stuff for later
 bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
   return (*m1) < (*m2);