From 29c6d838bafecd697d55b51f72f1813f36b78ae3 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 24 Mar 2009 19:00:02 +0100 Subject: [PATCH] fixing issues with hidden virtual methods --- src/client/backlogrequester.cpp | 2 +- src/client/backlogrequester.h | 4 ++-- src/client/clientbacklogmanager.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp index 3aee9313..b26fe172 100644 --- a/src/client/backlogrequester.cpp +++ b/src/client/backlogrequester.cpp @@ -86,7 +86,7 @@ GlobalUnreadBacklogRequester::GlobalUnreadBacklogRequester(ClientBacklogManager _additional = backlogSettings.globalUnreadBacklogAdditional(); } -void GlobalUnreadBacklogRequester::requestBacklog() { +void GlobalUnreadBacklogRequester::requestInitialBacklog() { MsgId oldestUnreadMessage; foreach(BufferId bufferId, allBufferIds()) { MsgId msgId = Client::networkModel()->lastSeenMsgId(bufferId); diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h index 8aa36274..c7c3afe9 100644 --- a/src/client/backlogrequester.h +++ b/src/client/backlogrequester.h @@ -52,7 +52,7 @@ public: bool buffer(BufferId bufferId, const MessageList &messages); virtual void requestBacklog(const BufferIdList &bufferIds) = 0; - virtual inline void requestBacklog() { requestBacklog(allBufferIds()); } + virtual inline void requestInitialBacklog() { requestBacklog(allBufferIds()); } protected: BufferIdList allBufferIds() const; @@ -88,7 +88,7 @@ private: class GlobalUnreadBacklogRequester : public BacklogRequester { public: GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager); - virtual void requestBacklog(); + virtual void requestInitialBacklog(); virtual void requestBacklog(const BufferIdList &) {} private: diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp index 624d69ce..2b2c5864 100644 --- a/src/client/clientbacklogmanager.cpp +++ b/src/client/clientbacklogmanager.cpp @@ -90,7 +90,7 @@ void ClientBacklogManager::requestInitialBacklog() { _requester = new FixedBacklogRequester(this); }; - _requester->requestBacklog(); + _requester->requestInitialBacklog(); if(_requester->isBuffering()) { updateProgress(0, _requester->totalBuffers()); } -- 2.20.1