From 26b9300ccab24e526a9f43bef95a2a70f59161df Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 25 Nov 2008 23:37:16 +0100 Subject: [PATCH] minor api cleanup for requesting messages from backlog --- src/client/clientbacklogmanager.cpp | 4 ++-- src/client/clientbacklogmanager.h | 2 +- src/common/backlogmanager.cpp | 4 ++-- src/common/backlogmanager.h | 2 +- src/core/core.cpp | 4 ++-- src/core/core.h | 4 ++-- src/core/corebacklogmanager.cpp | 4 ++-- src/core/corebacklogmanager.h | 2 +- src/core/sqlitestorage.cpp | 4 ++-- src/core/sqlitestorage.h | 2 +- src/core/storage.h | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp index 518ac243..8ccaa4b0 100644 --- a/src/client/clientbacklogmanager.cpp +++ b/src/client/clientbacklogmanager.cpp @@ -35,8 +35,8 @@ ClientBacklogManager::ClientBacklogManager(QObject *parent) { } -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()) diff --git a/src/client/clientbacklogmanager.h b/src/client/clientbacklogmanager.h index 400edcba..60514979 100644 --- a/src/client/clientbacklogmanager.h +++ b/src/client/clientbacklogmanager.h @@ -40,7 +40,7 @@ public: 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: diff --git a/src/common/backlogmanager.cpp b/src/common/backlogmanager.cpp index 63752517..cbe21e94 100644 --- a/src/common/backlogmanager.cpp +++ b/src/common/backlogmanager.cpp @@ -20,7 +20,7 @@ #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(); } diff --git a/src/common/backlogmanager.h b/src/common/backlogmanager.h index 05ed59ca..bb562e5e 100644 --- a/src/common/backlogmanager.h +++ b/src/common/backlogmanager.h @@ -31,7 +31,7 @@ public: 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: diff --git a/src/core/core.cpp b/src/core/core.cpp index 34a25cb5..e30264be 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -310,9 +310,9 @@ MsgId Core::storeMessage(const Message &message) { return instance()->storage->logMessage(message); } -QList Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) { +QList 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 Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) { diff --git a/src/core/core.h b/src/core/core.h index a2a15ae4..2b63646d 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -199,11 +199,11 @@ class Core : public QObject { /** \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 requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1); + static QList 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. diff --git a/src/core/corebacklogmanager.cpp b/src/core/corebacklogmanager.cpp index 7c79cb7d..c7bc8e72 100644 --- a/src/core/corebacklogmanager.cpp +++ b/src/core/corebacklogmanager.cpp @@ -30,10 +30,10 @@ CoreBacklogManager::CoreBacklogManager(CoreSession *coreSession) { } -QVariantList CoreBacklogManager::requestBacklog(BufferId bufferId, int lastMsgs, int offset) { +QVariantList CoreBacklogManager::requestBacklog(BufferId bufferId, int limit, int offset) { QVariantList backlog; QList msgList; - msgList = Core::requestMsgs(coreSession()->user(), bufferId, lastMsgs, offset); + msgList = Core::requestMsgs(coreSession()->user(), bufferId, limit, offset); QList::const_iterator msgIter = msgList.constBegin(); QList::const_iterator msgListEnd = msgList.constEnd(); diff --git a/src/core/corebacklogmanager.h b/src/core/corebacklogmanager.h index 7d7e1d89..260f99f8 100644 --- a/src/core/corebacklogmanager.h +++ b/src/core/corebacklogmanager.h @@ -36,7 +36,7 @@ public: 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; diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 6d74864e..f495acdf 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -693,7 +693,7 @@ MsgId SqliteStorage::logMessage(Message msg) { return msgId; } -QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int lastmsgs, int offset) { +QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int limit, int offset) { QList messagelist; BufferInfo bufferInfo = getBufferInfo(user, bufferId); @@ -719,7 +719,7 @@ QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int la msgQuery.prepare(queryString("select_messages")); msgQuery.bindValue(":bufferid", bufferId.toInt()); - msgQuery.bindValue(":limit", lastmsgs); + msgQuery.bindValue(":limit", limit); msgQuery.bindValue(":offset", offset); safeExec(msgQuery); diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h index 7ac1cb47..9df9be34 100644 --- a/src/core/sqlitestorage.h +++ b/src/core/sqlitestorage.h @@ -81,7 +81,7 @@ public slots: /* Message handling */ virtual MsgId logMessage(Message msg); - virtual QList requestMsgs(UserId user, BufferId bufferId, int lastmsgs = -1, int offset = -1); + virtual QList requestMsgs(UserId user, BufferId bufferId, int limit = -1, int offset = -1); virtual QList requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset = -1); virtual QList requestMsgRange(UserId user, BufferId bufferId, int first, int last); diff --git a/src/core/storage.h b/src/core/storage.h index 9bf9a0ad..5743853d 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -292,11 +292,11 @@ class Storage : public QObject { //! 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 requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1) = 0; + virtual QList 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 -- 2.20.1