X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=8945b0eae0f4ebb67e6e663669e2c8a58046a5ec;hp=1c2e0db08b77da23e69ae035ae6a34147d1c75e2;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba

diff --git a/src/core/core.h b/src/core/core.h
index 1c2e0db0..8945b0ea 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.
@@ -221,40 +234,25 @@ class Core : public QObject {
     return instance()->storage->logMessage(message);
   }
 
-  //! Request a certain number (or all) messages stored in a given buffer.
-  /** \note This method is threadsafe.
-   *
-   *  \param buffer   The buffer we request messages from
-   *  \param limit The number of messages we would like to receive, or -1 if we'd like all messages from that buffername
-   *  \param offset   Do not return (but DO count) messages with MsgId >= offset, if offset >= 0
-   *  \return The requested list of messages
-   */
-  static inline QList<Message> requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1) {
-    return instance()->storage->requestMsgs(user, buffer, limit, offset);
-  }
-
-  //! Request messages stored in a given buffer since a certain point in time.
-  /** \note This method is threadsafe.
-   *
-   *  \param buffer   The buffer we request messages from
-   *  \param since    Only return messages newer than this point in time
-   *  \param offset   Do not return messages with MsgId >= offset, if offset >= 0
+  //! Request a certain number messages stored in a given buffer.
+  /** \param buffer   The buffer we request messages from
+   *  \param first    if != -1 return only messages with a MsgId >= first
+   *  \param last     if != -1 return only messages with a MsgId < last
+   *  \param limit    if != -1 limit the returned list to a max of \limit entries
    *  \return The requested list of messages
    */
-  static inline QList<Message> requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1) {
-    return instance()->storage->requestMsgs(user, buffer, since, offset);
+  static inline QList<Message> requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1) {
+    return instance()->storage->requestMsgs(user, bufferId, first, last, limit);
   }
 
-  //! Request a range of messages stored in a given buffer.
-  /** \note This method is threadsafe.
-   *
-   *  \param buffer   The buffer we request messages from
-   *  \param first    Return messages with first <= MsgId <= last
-   *  \param last     Return messages with first <= MsgId <= last
+  //! Request a certain number of messages across all buffers
+  /** \param first    if != -1 return only messages with a MsgId >= first
+   *  \param last     if != -1 return only messages with a MsgId < last
+   *  \param limit    Max amount of messages
    *  \return The requested list of messages
    */
-  static inline QList<Message> requestMsgRange(UserId user, BufferId buffer, int first, int last) {
-    return instance()->storage->requestMsgRange(user, buffer, first, last);
+  static inline QList<Message> requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1) {
+    return instance()->storage->requestAllMsgs(user, first, last, limit);
   }
 
   //! Request a list of all buffers known to a user.
@@ -294,13 +292,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
@@ -327,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.