{
}
-void ClientBacklogManager::receiveBacklog(BufferId bufferId, int lastMsgs, int offset, QVariantList msgs) {
- Q_UNUSED(lastMsgs)
+void ClientBacklogManager::receiveBacklog(BufferId bufferId, int limit, int offset, QVariantList msgs) {
+ Q_UNUSED(limit)
Q_UNUSED(offset)
if(msgs.isEmpty())
void reset();
public slots:
- virtual void receiveBacklog(BufferId bufferId, int lastMsgs, int offset, QVariantList msgs);
+ virtual void receiveBacklog(BufferId bufferId, int limit, int offset, QVariantList msgs);
void requestInitialBacklog();
signals:
#include "backlogmanager.h"
-QVariantList BacklogManager::requestBacklog(BufferId bufferId, int lastMsgs, int offset) {
- emit backlogRequested(bufferId, lastMsgs, offset);
+QVariantList BacklogManager::requestBacklog(BufferId bufferId, int limit, int offset) {
+ emit backlogRequested(bufferId, limit, offset);
return QVariantList();
}
BacklogManager(QObject *parent = 0) : SyncableObject(parent) {}
public slots:
- virtual QVariantList requestBacklog(BufferId bufferId, int lastMsgs = -1, int offset = -1);
+ virtual QVariantList requestBacklog(BufferId bufferId, int limit = -1, int offset = -1);
inline virtual void receiveBacklog(BufferId, int, int, QVariantList) {};
signals:
return instance()->storage->logMessage(message);
}
-QList<Message> Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) {
+QList<Message> Core::requestMsgs(UserId user, BufferId buffer, int limit, int offset) {
// QMutexLocker locker(&mutex);
- return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset);
+ return instance()->storage->requestMsgs(user, buffer, limit, offset);
}
QList<Message> Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) {
/** \note This method is threadsafe.
*
* \param buffer The buffer we request messages from
- * \param lastmsgs The number of messages we would like to receive, or -1 if we'd like all messages from that buffername
+ * \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 QList<Message> requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1);
+ static QList<Message> requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1);
//! Request messages stored in a given buffer since a certain point in time.
/** \note This method is threadsafe.
{
}
-QVariantList CoreBacklogManager::requestBacklog(BufferId bufferId, int lastMsgs, int offset) {
+QVariantList CoreBacklogManager::requestBacklog(BufferId bufferId, int limit, int offset) {
QVariantList backlog;
QList<Message> msgList;
- msgList = Core::requestMsgs(coreSession()->user(), bufferId, lastMsgs, offset);
+ msgList = Core::requestMsgs(coreSession()->user(), bufferId, limit, offset);
QList<Message>::const_iterator msgIter = msgList.constBegin();
QList<Message>::const_iterator msgListEnd = msgList.constEnd();
CoreSession *coreSession() { return _coreSession; }
public slots:
- virtual QVariantList requestBacklog(BufferId bufferId, int lastMsgs = -1, int offset = -1);
+ virtual QVariantList requestBacklog(BufferId bufferId, int limit = -1, int offset = -1);
private:
CoreSession *_coreSession;
return msgId;
}
-QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int limit, int offset) {
QList<Message> messagelist;
BufferInfo bufferInfo = getBufferInfo(user, bufferId);
msgQuery.prepare(queryString("select_messages"));
msgQuery.bindValue(":bufferid", bufferId.toInt());
- msgQuery.bindValue(":limit", lastmsgs);
+ msgQuery.bindValue(":limit", limit);
msgQuery.bindValue(":offset", offset);
safeExec(msgQuery);
/* Message handling */
virtual MsgId logMessage(Message msg);
- virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int lastmsgs = -1, int offset = -1);
+ virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int limit = -1, int offset = -1);
virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset = -1);
virtual QList<Message> requestMsgRange(UserId user, BufferId bufferId, int first, int last);
//! Request a certain number (or all) messages stored in a given buffer.
/** \param buffer The buffer we request messages from
- * \param lastmsgs The number of messages we would like to receive, or -1 if we'd like all messages from that buffername
+ * \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
*/
- virtual QList<Message> requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1) = 0;
+ virtual QList<Message> requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1) = 0;
//! Request messages stored in a given buffer since a certain point in time.
/** \param buffer The buffer we request messages from