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

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 816227fa..82fe0da0 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,11 +20,17 @@
 
 #include "buffersyncer.h"
 
+INIT_SYNCABLE_OBJECT(BufferSyncer)
 BufferSyncer::BufferSyncer(QObject *parent)
   : SyncableObject(parent)
 {
 }
 
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent)
+  : SyncableObject(parent),
+    _lastSeenMsg(lastSeenMsg)
+{
+}
 
 MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
   if(_lastSeenMsg.contains(buffer))
@@ -39,6 +45,7 @@ bool BufferSyncer::setLastSeenMsg(BufferId buffer, const MsgId &msgId) {
   const MsgId oldLastSeenMsg = lastSeenMsg(buffer);
   if(!oldLastSeenMsg.isValid() || oldLastSeenMsg < msgId) {
     _lastSeenMsg[buffer] = msgId;
+    SYNC(ARG(buffer), ARG(msgId))
     emit lastSeenMsgSet(buffer, msgId);
     return true;
   }
@@ -65,12 +72,15 @@ 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);
-  }
+  SYNC(ARG(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);
+  SYNC(ARG(buffer1), ARG(buffer2))
+  emit buffersPermanentlyMerged(buffer1, buffer2);
+}