X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=53a6a31bf43e1f74a6a2dad7cdc144da92ef9b15;hp=6ddb6e864b46ef5818004775281be98616d546a7;hb=cd37744f0a2cd8ffe027892ddce5c7d6f4848ab0;hpb=7897b8623a42967511e31c68d5c102033a1dcdb9

diff --git a/src/core/core.h b/src/core/core.h
index 6ddb6e86..53a6a31b 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -208,10 +208,11 @@ class Core : public QObject {
    *  \param networkId The network id
    *  \param type      The type of the buffer (StatusBuffer, Channel, etc.)
    *  \param buffer    The buffer name (if empty, the net's status buffer is returned)
+   *  \param create    Whether or not the buffer should be created if it doesnt exist
    *  \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found
    */
-  static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "") {
-    return instance()->storage->getBufferInfo(user, networkId, type, buffer);
+  static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true) {
+    return instance()->storage->bufferInfo(user, networkId, type, buffer, create);
   }
 
   //! Get the unique BufferInfo for a bufferId
@@ -300,6 +301,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 +336,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.