Fixes #510 - Network item shows wrong buffer

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

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index b942d7b..2ff1951 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,18 +28,18 @@
 #include "networkmodel.h"
 #include "types.h"
 
-class BacklogManager;
+class ClientBacklogManager;
 
 class BacklogRequester {
 public:
   enum RequesterTypes {
     InvalidRequester = 0,
-    GlobalUnread,
+    PerBufferFixed,
     PerBufferUnread,
-    PerBufferFixed
+    GlobalUnread
   };
 
-  BacklogRequester(bool buffering, BacklogManager *backlogManger);
+  BacklogRequester(bool buffering, ClientBacklogManager *backlogManger);
   virtual inline ~BacklogRequester() {}
 
   inline bool isBuffering() { return _isBuffering; }
@@ -55,7 +55,8 @@ protected:
   inline void setWaitingBuffers(const QList<BufferId> &buffers) { _buffersWaiting = buffers.toSet(); }
   inline void setWaitingBuffers(const QSet<BufferId> &buffers) { _buffersWaiting = buffers; }
   inline void addWaitingBuffer(BufferId buffer) { _buffersWaiting << buffer; }
-  BacklogManager *backlogManager;
+
+  ClientBacklogManager *backlogManager;
 
 private:
   bool _isBuffering;
@@ -68,12 +69,37 @@ private:
 // ========================================
 class FixedBacklogRequester : public BacklogRequester {
 public:
-  FixedBacklogRequester(BacklogManager *backlogManager);
+  FixedBacklogRequester(ClientBacklogManager *backlogManager);
   virtual void requestBacklog();
 
 private:
   int _backlogCount;
 };
 
+// ========================================
+//  GLOBAL UNREAD BACKLOG REQUESTER
+// ========================================
+class GlobalUnreadBacklogRequester : public BacklogRequester {
+public:
+  GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);
+  virtual void requestBacklog();
+
+private:
+  int _limit;
+  int _additional;
+};
+
+// ========================================
+//  PER BUFFER UNREAD BACKLOG REQUESTER
+// ========================================
+class PerBufferUnreadBacklogRequester : public BacklogRequester {
+public:
+  PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager);
+  virtual void requestBacklog();
+
+private:
+  int _limit;
+  int _additional;
+};
 
 #endif //BACKLOGREQUESTER_H