X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=9612a5945ff62ebc0949bba9664aae4a180a37ef;hp=a7aaae919a2cbb9ef25bbc15237d2e19826865ce;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=1658ab9a8f4287fde15f3ceb13503282a6948990

diff --git a/src/core/storage.h b/src/core/storage.h
index a7aaae91..9612a594 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -274,7 +274,16 @@ public slots:
    *  \return true if successfull
    */
   virtual bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) = 0;
-  
+
+  //! Merge the content of two Buffers permanently. This cannot be reversed!
+  /** \note This method is threadsafe.
+   *  \param user      The id of the buffer owner
+   *  \param bufferId1 The bufferId of the remaining buffer
+   *  \param bufferId2 The buffer that is about to be removed
+   *  \return true if successfull
+   */
+  virtual bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) = 0;
+
   //! Update the LastSeenDate for a Buffer
   /** This Method is used to make the LastSeenDate of a Buffer persistent
    * \param user      The Owner of that Buffer