Fixing backlog timestamps when merging from sqlite.

[quassel.git] / src / client / backlogrequester.h

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index 85558f8..c7c3afe 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -51,11 +51,11 @@ public:
   //! returns false if it was the last missing backlogpart
   bool buffer(BufferId bufferId, const MessageList &messages);
   
-  virtual inline void requestBacklog() { requestBacklog(allBufferIds()); }
-  virtual void requestBacklog(const QList<BufferId> &bufferIds) = 0;
+  virtual void requestBacklog(const BufferIdList &bufferIds) = 0;
+  virtual inline void requestInitialBacklog() { requestBacklog(allBufferIds()); }
 
 protected:
-  QList<BufferId> allBufferIds() const;
+  BufferIdList allBufferIds() const;
   inline void setWaitingBuffers(const QList<BufferId> &buffers) { setWaitingBuffers(buffers.toSet()); }
   void setWaitingBuffers(const QSet<BufferId> &buffers);
   void addWaitingBuffer(BufferId buffer);
@@ -76,7 +76,7 @@ private:
 class FixedBacklogRequester : public BacklogRequester {
 public:
   FixedBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog(const QList<BufferId> &bufferIds);
+  virtual void requestBacklog(const BufferIdList &bufferIds);
 
 private:
   int _backlogCount;
@@ -88,8 +88,8 @@ private:
 class GlobalUnreadBacklogRequester : public BacklogRequester {
 public:
   GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog();
-  virtual void requestBacklog(const QList<BufferId> &) {}
+  virtual void requestInitialBacklog();
+  virtual void requestBacklog(const BufferIdList &) {}
 
 private:
   int _limit;
@@ -102,7 +102,7 @@ private:
 class PerBufferUnreadBacklogRequester : public BacklogRequester {
 public:
   PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog(const QList<BufferId> &bufferIds);
+  virtual void requestBacklog(const BufferIdList &bufferIds);
 
 private:
   int _limit;