introducing query merging (per drag & drop). needs a core update

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index 0c6e88d..8945b0e 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -292,13 +292,23 @@ class Core : public QObject {
   //! Rename a Buffer
   /** \note This method is threadsafe.
    *  \param user      The id of the buffer owner
   //! Rename a Buffer
   /** \note This method is threadsafe.
    *  \param user      The id of the buffer owner

-   *  \param networkId The id of the network the buffer belongs to
+   *  \param bufferId  The bufferId

    *  \param newName   The new name of the buffer
    *  \param newName   The new name of the buffer

-   *  \param oldName   The previous name of the buffer
-   *  \return the BufferId of the affected buffer or an invalid BufferId if not successfull
+   *  \return true if successfull
+   */
+  static inline bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) {
+    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 BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
-    return instance()->storage->renameBuffer(user, networkId, newName, oldName);
+  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
   }
 
   //! Update the LastSeenDate for a Buffer


@@ -325,6 +335,8 @@ class Core : public QObject {
 
   const QDateTime &startTime() const { return _startTime; }
 
 
   const QDateTime &startTime() const { return _startTime; }
 

+  static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
+

 public slots:
   //! Make storage data persistent
   /** \note This method is threadsafe.
 public slots:
   //! Make storage data persistent
   /** \note This method is threadsafe.