X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=8945b0eae0f4ebb67e6e663669e2c8a58046a5ec;hp=6ddb6e864b46ef5818004775281be98616d546a7;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=1658ab9a8f4287fde15f3ceb13503282a6948990

diff --git a/src/core/core.h b/src/core/core.h
index 6ddb6e86..8945b0ea 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -300,6 +300,17 @@ class Core : public QObject {
     return instance()->storage->renameBuffer(user, bufferId, newName);
   }
 
+  //! 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 successfulln
+   */
+  static inline bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) {
+    return instance()->storage->mergeBuffersPermanently(user, bufferId1, bufferId2);
+  }
+
   //! Update the LastSeenDate for a Buffer
   /** This Method is used to make the LastSeenDate of a Buffer persistent
    *  \note This method is threadsafe.
@@ -324,6 +335,8 @@ class Core : public QObject {
 
   const QDateTime &startTime() const { return _startTime; }
 
+  static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
+
 public slots:
   //! Make storage data persistent
   /** \note This method is threadsafe.