X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.h;h=f57caaec60eb356d53158209b47b8cb4df203667;hp=92ca54d5c40bc69d25a662e3a865b463548d5009;hb=891c87b4e52022480f2ab71b598bfde721815df5;hpb=7897b8623a42967511e31c68d5c102033a1dcdb9

diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h
index 92ca54d5..f57caaec 100644
--- a/src/common/buffersyncer.h
+++ b/src/common/buffersyncer.h
@@ -38,19 +38,29 @@ public slots:
   void initSetLastSeenMsg(const QVariantList &);
 
   virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { emit setLastSeenMsgRequested(buffer, msgId); }
+
   virtual inline void requestRemoveBuffer(BufferId buffer) { emit removeBufferRequested(buffer); }
   virtual void removeBuffer(BufferId buffer);
+
   virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { emit renameBufferRequested(buffer, newName); }
   virtual inline void renameBuffer(BufferId buffer, QString newName) { emit bufferRenamed(buffer, newName); }
 
+  virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { emit mergeBuffersPermanentlyRequested(buffer1, buffer2); }
+  virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
+
 signals:
   void lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
   void setLastSeenMsgRequested(BufferId buffer, const MsgId &msgId);
+
   void removeBufferRequested(BufferId buffer);
   void bufferRemoved(BufferId buffer);
+
   void renameBufferRequested(BufferId buffer, QString newName);
   void bufferRenamed(BufferId buffer, QString newName);
 
+  void mergeBuffersPermanentlyRequested(BufferId buffer1, BufferId buffer2);
+  void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
+
 protected slots:
   bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);