X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=f05d16376d867d6ae620712143d1c76f44154fc7;hp=fe69db71d2918d0361da005b136ca7c36544c27e;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index fe69db71..f05d1637 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  *
@@ -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))
@@ -64,22 +69,15 @@ void BufferSyncer::initSetLastSeenMsg(const QVariantList &list) {
   }
 }
 
-void BufferSyncer::requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) {
-  if(setLastSeenMsg(buffer, msgId))
-    emit setLastSeenMsgRequested(buffer, msgId);
-}
-
-
-void BufferSyncer::requestRemoveBuffer(BufferId buffer) {
-  emit removeBufferRequested(buffer);
-}
-
 void BufferSyncer::removeBuffer(BufferId buffer) {
   if(_lastSeenMsg.contains(buffer))
     _lastSeenMsg.remove(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);
 }