X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=083bf8cf051e296ee5e124bdc7bee2939446a5ab;hp=1c2e0db08b77da23e69ae035ae6a34147d1c75e2;hb=9ba9f4c7b0122803fe0d73a8556b1506e77d32a4;hpb=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba

diff --git a/src/core/core.h b/src/core/core.h
index 1c2e0db0..083bf8cf 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -221,40 +221,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.