X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=3392403f1dcf0b13bec51d38ca183a8449e7b139;hp=816227fad658693f4ffce28daa1240db3f8b936e;hb=558260f52de5a9b1364f5672ace17554efc10a74;hpb=7897b8623a42967511e31c68d5c102033a1dcdb9

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 816227fa..3392403f 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -25,6 +25,11 @@ BufferSyncer::BufferSyncer(QObject *parent)
 {
 }
 
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent)
+  : SyncableObject(parent),
+    _lastSeenMsg(lastSeenMsg)
+{
+}
 
 MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
   if(_lastSeenMsg.contains(buffer))
@@ -65,12 +70,14 @@ void BufferSyncer::initSetLastSeenMsg(const QVariantList &list) {
 }
 
 void BufferSyncer::removeBuffer(BufferId buffer) {
-  if(_lastSeenMsg.contains(buffer)) {
+  if(_lastSeenMsg.contains(buffer))
     _lastSeenMsg.remove(buffer);
-    emit bufferRemoved(buffer);
-  }
+  emit bufferRemoved(buffer);
 }
 
-// void BufferSyncer::renameBuffer(BufferId buffer, QString newName) {
-//   emit bufferRenamed(buffer, newName);
-// }
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
+  if(_lastSeenMsg.contains(buffer2))
+    _lastSeenMsg.remove(buffer2);
+  emit buffersPermanentlyMerged(buffer1, buffer2);
+}