X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbacklogrequester.cpp;h=23ce6969953a71009c5ddee1f4912b869b1c0c7a;hp=4a6524cca092b73905d433b8f02948fc24059f43;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index 4a6524cc..23ce6969 100644
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -27,101 +27,120 @@
 #include "clientbacklogmanager.h"
 
 BacklogRequester::BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManager)
-  : backlogManager(backlogManager),
+    : backlogManager(backlogManager),
     _isBuffering(buffering),
     _requesterType(requesterType),
     _totalBuffers(0)
 {
-  Q_ASSERT(backlogManager);
+    Q_ASSERT(backlogManager);
 }
 
-void BacklogRequester::setWaitingBuffers(const QSet<BufferId> &buffers) {
-  _buffersWaiting = buffers;
-  _totalBuffers = _buffersWaiting.count();
+
+void BacklogRequester::setWaitingBuffers(const QSet<BufferId> &buffers)
+{
+    _buffersWaiting = buffers;
+    _totalBuffers = _buffersWaiting.count();
 }
 
-void BacklogRequester::addWaitingBuffer(BufferId buffer) {
-  _buffersWaiting << buffer;
-  _totalBuffers++;
+
+void BacklogRequester::addWaitingBuffer(BufferId buffer)
+{
+    _buffersWaiting << buffer;
+    _totalBuffers++;
 }
 
-bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
-  _bufferedMessages << messages;
-  _buffersWaiting.remove(bufferId);
-  return !_buffersWaiting.isEmpty();
+
+bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages)
+{
+    _bufferedMessages << messages;
+    _buffersWaiting.remove(bufferId);
+    return !_buffersWaiting.isEmpty();
 }
 
-BufferIdList BacklogRequester::allBufferIds() const {
-  QSet<BufferId> bufferIds = Client::bufferViewOverlay()->bufferIds();
-  bufferIds += Client::bufferViewOverlay()->tempRemovedBufferIds();
-  return bufferIds.toList();
+
+BufferIdList BacklogRequester::allBufferIds() const
+{
+    QSet<BufferId> bufferIds = Client::bufferViewOverlay()->bufferIds();
+    bufferIds += Client::bufferViewOverlay()->tempRemovedBufferIds();
+    return bufferIds.toList();
 }
 
-void BacklogRequester::flushBuffer() {
-  if(!_buffersWaiting.isEmpty()) {
-    qWarning() << Q_FUNC_INFO << "was called before all backlog was received:"
-               << _buffersWaiting.count() << "buffers are waiting.";
-  }
-  _bufferedMessages.clear();
-  _totalBuffers = 0;
-  _buffersWaiting.clear();
+
+void BacklogRequester::flushBuffer()
+{
+    if (!_buffersWaiting.isEmpty()) {
+        qWarning() << Q_FUNC_INFO << "was called before all backlog was received:"
+                   << _buffersWaiting.count() << "buffers are waiting.";
+    }
+    _bufferedMessages.clear();
+    _totalBuffers = 0;
+    _buffersWaiting.clear();
 }
 
+
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
 FixedBacklogRequester::FixedBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(true, BacklogRequester::PerBufferFixed, backlogManager)
+    : BacklogRequester(true, BacklogRequester::PerBufferFixed, backlogManager)
 {
-  BacklogSettings backlogSettings;
-  _backlogCount = backlogSettings.fixedBacklogAmount();
+    BacklogSettings backlogSettings;
+    _backlogCount = backlogSettings.fixedBacklogAmount();
 }
 
-void FixedBacklogRequester::requestBacklog(const BufferIdList &bufferIds) {
-  setWaitingBuffers(bufferIds);
-  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 backlog messages for %2 buffers").arg(_backlogCount * bufferIds.count()).arg(bufferIds.count()));
-  foreach(BufferId bufferId, bufferIds) {
-    backlogManager->requestBacklog(bufferId, -1, -1, _backlogCount);
-  }
+
+void FixedBacklogRequester::requestBacklog(const BufferIdList &bufferIds)
+{
+    setWaitingBuffers(bufferIds);
+    backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 backlog messages for %2 buffers").arg(_backlogCount * bufferIds.count()).arg(bufferIds.count()));
+    foreach(BufferId bufferId, bufferIds) {
+        backlogManager->requestBacklog(bufferId, -1, -1, _backlogCount);
+    }
 }
 
+
 // ========================================
 //  GLOBAL UNREAD BACKLOG REQUESTER
 // ========================================
 GlobalUnreadBacklogRequester::GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(false, BacklogRequester::GlobalUnread, backlogManager)
+    : BacklogRequester(false, BacklogRequester::GlobalUnread, backlogManager)
 {
-  BacklogSettings backlogSettings;
-  _limit = backlogSettings.globalUnreadBacklogLimit();
-  _additional = backlogSettings.globalUnreadBacklogAdditional();
+    BacklogSettings backlogSettings;
+    _limit = backlogSettings.globalUnreadBacklogLimit();
+    _additional = backlogSettings.globalUnreadBacklogAdditional();
 }
 
-void GlobalUnreadBacklogRequester::requestInitialBacklog() {
-  MsgId oldestUnreadMessage;
-  foreach(BufferId bufferId, allBufferIds()) {
-    MsgId msgId = Client::networkModel()->lastSeenMsgId(bufferId);
-    if(!oldestUnreadMessage.isValid() || oldestUnreadMessage > msgId)
-      oldestUnreadMessage = msgId;
-  }
-  backlogManager->emitMessagesRequested(QObject::tr("Requesting up to %1 of all unread backlog messages (plus additional %2)").arg(_limit).arg(_additional));
-  backlogManager->requestBacklogAll(oldestUnreadMessage, -1, _limit, _additional);
+
+void GlobalUnreadBacklogRequester::requestInitialBacklog()
+{
+    MsgId oldestUnreadMessage;
+    foreach(BufferId bufferId, allBufferIds()) {
+        MsgId msgId = Client::networkModel()->lastSeenMsgId(bufferId);
+        if (!oldestUnreadMessage.isValid() || oldestUnreadMessage > msgId)
+            oldestUnreadMessage = msgId;
+    }
+    backlogManager->emitMessagesRequested(QObject::tr("Requesting up to %1 of all unread backlog messages (plus additional %2)").arg(_limit).arg(_additional));
+    backlogManager->requestBacklogAll(oldestUnreadMessage, -1, _limit, _additional);
 }
 
+
 // ========================================
 //  PER BUFFER UNREAD BACKLOG REQUESTER
 // ========================================
 PerBufferUnreadBacklogRequester::PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(true, BacklogRequester::PerBufferUnread, backlogManager)
+    : BacklogRequester(true, BacklogRequester::PerBufferUnread, backlogManager)
 {
-  BacklogSettings backlogSettings;
-  _limit = backlogSettings.perBufferUnreadBacklogLimit();
-  _additional = backlogSettings.perBufferUnreadBacklogAdditional();
+    BacklogSettings backlogSettings;
+    _limit = backlogSettings.perBufferUnreadBacklogLimit();
+    _additional = backlogSettings.perBufferUnreadBacklogAdditional();
 }
 
-void PerBufferUnreadBacklogRequester::requestBacklog(const BufferIdList &bufferIds) {
-  setWaitingBuffers(bufferIds);
-  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 unread backlog messages for %2 buffers").arg((_limit + _additional) * bufferIds.count()).arg(bufferIds.count()));
-  foreach(BufferId bufferId, bufferIds) {
-    backlogManager->requestBacklog(bufferId, Client::networkModel()->lastSeenMsgId(bufferId), -1, _limit, _additional);
-  }
+
+void PerBufferUnreadBacklogRequester::requestBacklog(const BufferIdList &bufferIds)
+{
+    setWaitingBuffers(bufferIds);
+    backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 unread backlog messages for %2 buffers").arg((_limit + _additional) * bufferIds.count()).arg(bufferIds.count()));
+    foreach(BufferId bufferId, bufferIds) {
+        backlogManager->requestBacklog(bufferId, Client::networkModel()->lastSeenMsgId(bufferId), -1, _limit, _additional);
+    }
 }