qa: Avoid deprecation warnings for QList/QSet conversions

[quassel.git] / src / client / bufferviewoverlay.cpp

diff --git a/src/client/bufferviewoverlay.cpp b/src/client/bufferviewoverlay.cpp
index fe0d97a..455f273 100644 (file)
--- a/src/client/bufferviewoverlay.cpp
+++ b/src/client/bufferviewoverlay.cpp
@@ -27,6 +27,7 @@
 #include "clientbacklogmanager.h"
 #include "clientbufferviewmanager.h"
 #include "networkmodel.h"
 #include "clientbacklogmanager.h"
 #include "clientbufferviewmanager.h"
 #include "networkmodel.h"

+#include "util.h"

 
 const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
 
 
 const int BufferViewOverlay::_updateEventId = QEvent::registerEventType();
 


@@ -92,13 +93,13 @@ void BufferViewOverlay::addView(int viewId)
                     if (Client::networkModel()->networkId(bufferId) == config->networkId())
                         buffers << bufferId;
                 }
                     if (Client::networkModel()->networkId(bufferId) == config->networkId())
                         buffers << bufferId;
                 }

-                foreach (BufferId bufferId, config->temporarilyRemovedBuffers().toList()) {
+                for (BufferId bufferId : config->temporarilyRemovedBuffers()) {

                     if (Client::networkModel()->networkId(bufferId) == config->networkId())
                         buffers << bufferId;
                 }
             }
             else {
                     if (Client::networkModel()->networkId(bufferId) == config->networkId())
                         buffers << bufferId;
                 }
             }
             else {

-                buffers = BufferIdList::fromSet(config->bufferList().toSet() + config->temporarilyRemovedBuffers());
+                buffers = (toQSet(config->bufferList()) + config->temporarilyRemovedBuffers()).values();

             }
             Client::backlogManager()->checkForBacklog(buffers);
         }
             }
             Client::backlogManager()->checkForBacklog(buffers);
         }


@@ -207,12 +208,12 @@ void BufferViewOverlay::updateHelper()
 
             // we have to apply several filters before we can add a buffer to a category (visible, removed, ...)
             buffers += filterBuffersByConfig(config->bufferList(), config);
 
             // we have to apply several filters before we can add a buffer to a category (visible, removed, ...)
             buffers += filterBuffersByConfig(config->bufferList(), config);

-            tempRemovedBuffers += filterBuffersByConfig(config->temporarilyRemovedBuffers().toList(), config);
+            tempRemovedBuffers += filterBuffersByConfig(config->temporarilyRemovedBuffers().values(), config);

             removedBuffers += config->removedBuffers();
         }
 
         // prune the sets from overlap
             removedBuffers += config->removedBuffers();
         }
 
         // prune the sets from overlap

-        QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
+        QSet<BufferId> availableBuffers = toQSet(Client::networkModel()->allBufferIds());

 
         buffers.intersect(availableBuffers);
 
 
         buffers.intersect(availableBuffers);