X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbacklogrequester.h;h=c8a51e6afc4fa350509e9469da60c55cdd5ebe4a;hp=8aa362748d7952495761a8c971f205b9a4d9ae50;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=54afee59c56e1a75352b32200b9503150601bd90

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index 8aa36274..c8a51e6a 100644
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,11 +15,12 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BACKLOGREQUESTER_H
-#define BACKLOGREQUESTER_H
+#pragma once
+
+#include <set>
 
 #include <QList>
 
@@ -30,83 +31,86 @@
 
 class ClientBacklogManager;
 
-class BacklogRequester {
+class BacklogRequester
+{
 public:
-  enum RequesterType {
-    InvalidRequester = 0,
-    PerBufferFixed,
-    PerBufferUnread,
-    GlobalUnread
-  };
-
-  BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManger);
-  virtual inline ~BacklogRequester() {}
-
-  inline bool isBuffering() { return _isBuffering; }
-  inline RequesterType type() { return _requesterType; }
-  inline const QList<Message> &bufferedMessages() { return _bufferedMessages; }
-
-  inline int buffersWaiting() const { return _buffersWaiting.count(); }
-  inline int totalBuffers() const { return _totalBuffers; }
-  //! returns false if it was the last missing backlogpart
-  bool buffer(BufferId bufferId, const MessageList &messages);
-  
-  virtual void requestBacklog(const BufferIdList &bufferIds) = 0;
-  virtual inline void requestBacklog() { requestBacklog(allBufferIds()); }
+    enum RequesterType
+    {
+        InvalidRequester = 0,
+        PerBufferFixed,
+        PerBufferUnread,
+        GlobalUnread
+    };
+
+    BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager* backlogManger);
+    virtual ~BacklogRequester() = default;
+
+    inline bool isBuffering() { return _isBuffering; }
+    inline RequesterType type() { return _requesterType; }
+    inline const QList<Message>& bufferedMessages() { return _bufferedMessages; }
+
+    inline int buffersWaiting() const { return int(_buffersWaiting.size()); }
+    inline int totalBuffers() const { return _totalBuffers; }
+
+    bool buffer(BufferId bufferId, const MessageList& messages);  //! returns false if it was the last missing backlogpart
+
+    virtual void requestBacklog(const BufferIdList& bufferIds) = 0;
+    virtual inline void requestInitialBacklog() { requestBacklog(allBufferIds()); }
+
+    virtual void flushBuffer();
 
 protected:
-  BufferIdList allBufferIds() const;
-  inline void setWaitingBuffers(const QList<BufferId> &buffers) { setWaitingBuffers(buffers.toSet()); }
-  void setWaitingBuffers(const QSet<BufferId> &buffers);
-  void addWaitingBuffer(BufferId buffer);
+    BufferIdList allBufferIds() const;
+    void setWaitingBuffers(const BufferIdList& buffers);
 
-  ClientBacklogManager *backlogManager;
+    ClientBacklogManager* backlogManager;
 
 private:
-  bool _isBuffering;
-  RequesterType _requesterType;
-  MessageList _bufferedMessages;
-  int _totalBuffers;
-  QSet<BufferId> _buffersWaiting;
+    bool _isBuffering;
+    RequesterType _requesterType;
+    MessageList _bufferedMessages;
+    int _totalBuffers;
+    std::set<BufferId> _buffersWaiting;
 };
 
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
-class FixedBacklogRequester : public BacklogRequester {
+class FixedBacklogRequester : public BacklogRequester
+{
 public:
-  FixedBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog(const BufferIdList &bufferIds);
+    FixedBacklogRequester(ClientBacklogManager* backlogManager);
+    void requestBacklog(const BufferIdList& bufferIds) override;
 
 private:
-  int _backlogCount;
+    int _backlogCount;
 };
 
 // ========================================
 //  GLOBAL UNREAD BACKLOG REQUESTER
 // ========================================
-class GlobalUnreadBacklogRequester : public BacklogRequester {
+class GlobalUnreadBacklogRequester : public BacklogRequester
+{
 public:
-  GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog();
-  virtual void requestBacklog(const BufferIdList &) {}
+    GlobalUnreadBacklogRequester(ClientBacklogManager* backlogManager);
+    void requestInitialBacklog() override;
+    void requestBacklog(const BufferIdList&) override {}
 
 private:
-  int _limit;
-  int _additional;
+    int _limit;
+    int _additional;
 };
 
 // ========================================
 //  PER BUFFER UNREAD BACKLOG REQUESTER
 // ========================================
-class PerBufferUnreadBacklogRequester : public BacklogRequester {
+class PerBufferUnreadBacklogRequester : public BacklogRequester
+{
 public:
-  PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager);
-  virtual void requestBacklog(const BufferIdList &bufferIds);
+    PerBufferUnreadBacklogRequester(ClientBacklogManager* backlogManager);
+    void requestBacklog(const BufferIdList& bufferIds) override;
 
 private:
-  int _limit;
-  int _additional;
+    int _limit;
+    int _additional;
 };
-
-#endif //BACKLOGREQUESTER_H