qa: Avoid deprecation warnings for QList/QSet conversions

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

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index 7192aba..c8a51e6 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BACKLOGREQUESTER_H
-#define BACKLOGREQUESTER_H
+#pragma once
+
+#include <set>
 
 #include <QList>
 
@@ -33,90 +34,83 @@ class ClientBacklogManager;
 class BacklogRequester
 {
 public:
-    enum RequesterType {
+    enum RequesterType
+    {
         InvalidRequester = 0,
         PerBufferFixed,
         PerBufferUnread,
         GlobalUnread
     };
 
-    BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManger);
-    virtual inline ~BacklogRequester() {}
+    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 const QList<Message>& bufferedMessages() { return _bufferedMessages; }
 
-    inline int buffersWaiting() const { return _buffersWaiting.count(); }
+    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
+    bool buffer(BufferId bufferId, const MessageList& messages);  //! returns false if it was the last missing backlogpart
 
-    virtual void requestBacklog(const BufferIdList &bufferIds) = 0;
+    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);
+    void setWaitingBuffers(const BufferIdList& buffers);
 
-    ClientBacklogManager *backlogManager;
+    ClientBacklogManager* backlogManager;
 
 private:
     bool _isBuffering;
     RequesterType _requesterType;
     MessageList _bufferedMessages;
     int _totalBuffers;
-    QSet<BufferId> _buffersWaiting;
+    std::set<BufferId> _buffersWaiting;
 };
 
-
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
 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;
 };
 
-
 // ========================================
 //  GLOBAL UNREAD BACKLOG REQUESTER
 // ========================================
 class GlobalUnreadBacklogRequester : public BacklogRequester
 {
 public:
-    GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);
-    virtual void requestInitialBacklog();
-    virtual void requestBacklog(const BufferIdList &) {}
+    GlobalUnreadBacklogRequester(ClientBacklogManager* backlogManager);
+    void requestInitialBacklog() override;
+    void requestBacklog(const BufferIdList&) override {}
 
 private:
     int _limit;
     int _additional;
 };
 
-
 // ========================================
 //  PER BUFFER UNREAD BACKLOG REQUESTER
 // ========================================
 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;
 };
-
-
-#endif //BACKLOGREQUESTER_H