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 2ecb09a..c8a51e6 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 

-#ifndef BACKLOGREQUESTER_H
-#define BACKLOGREQUESTER_H
+#pragma once
+
+#include <set>

 
 #include <QList>
 
 
 #include <QList>
 


@@ -48,7 +49,7 @@ public:
     inline RequesterType type() { return _requesterType; }
     inline const QList<Message>& bufferedMessages() { return _bufferedMessages; }
 
     inline RequesterType type() { return _requesterType; }
     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
     inline int totalBuffers() const { return _totalBuffers; }
 
     bool buffer(BufferId bufferId, const MessageList& messages);  //! returns false if it was the last missing backlogpart


@@ -60,9 +61,7 @@ public:
 
 protected:
     BufferIdList allBufferIds() const;
 
 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;
 


@@ -71,7 +70,7 @@ private:
     RequesterType _requesterType;
     MessageList _bufferedMessages;
     int _totalBuffers;
     RequesterType _requesterType;
     MessageList _bufferedMessages;
     int _totalBuffers;

-    QSet<BufferId> _buffersWaiting;
+    std::set<BufferId> _buffersWaiting;

 };
 
 // ========================================
 };
 
 // ========================================


@@ -115,5 +114,3 @@ private:
     int _limit;
     int _additional;
 };
     int _limit;
     int _additional;
 };

-
-#endif  // BACKLOGREQUESTER_H