X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=1aa2fa384e6aa453a5ca968141ffd255ed2187a2;hp=083bf8cf051e296ee5e124bdc7bee2939446a5ab;hb=674ad8ee4369cbc9516eb6d6629a616e9310c71f;hpb=335e1e55ee8df69b37b1b4d839950ced9ac08cc4

diff --git a/src/core/core.h b/src/core/core.h
index 083bf8cf..1aa2fa38 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -79,6 +79,19 @@ class Core : public QObject {
     return instance()->storage->getUserSetting(userId, settingName, data);
   }
 
+  /* Identity handling */
+  static inline IdentityId createIdentity(UserId user, CoreIdentity &identity) {
+    return instance()->storage->createIdentity(user, identity);
+  }
+  static bool updateIdentity(UserId user, const CoreIdentity &identity) {
+    return instance()->storage->updateIdentity(user, identity);
+  }
+  static void removeIdentity(UserId user, IdentityId identityId) {
+    instance()->storage->removeIdentity(user, identityId);
+  }
+  static QList<CoreIdentity> identities(UserId user) {
+    return instance()->storage->identities(user);
+  }
 
   //! Create a Network in the Storage and store it's Id in the given NetworkInfo
   /** \note This method is thredsafe.
@@ -195,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
@@ -279,13 +293,23 @@ class Core : public QObject {
   //! 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 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 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 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 bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) {
+    return instance()->storage->mergeBuffersPermanently(user, bufferId1, bufferId2);
   }
 
   //! Update the LastSeenDate for a Buffer
@@ -312,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.