qa: Avoid deprecation warnings for QList/QSet conversions

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

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index 97cf892..6ff6378 100644 (file)
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -28,6 +28,7 @@
 #include "clientignorelistmanager.h"
 #include "messagemodel.h"
 #include "networkmodel.h"
 #include "clientignorelistmanager.h"
 #include "messagemodel.h"
 #include "networkmodel.h"

+#include "util.h"

 
 MessageFilter::MessageFilter(QAbstractItemModel* source, QObject* parent)
     : QSortFilterProxyModel(parent)
 
 MessageFilter::MessageFilter(QAbstractItemModel* source, QObject* parent)
     : QSortFilterProxyModel(parent)


@@ -39,7 +40,7 @@ MessageFilter::MessageFilter(QAbstractItemModel* source, QObject* parent)
 
 MessageFilter::MessageFilter(MessageModel* source, const QList<BufferId>& buffers, QObject* parent)
     : QSortFilterProxyModel(parent)
 
 MessageFilter::MessageFilter(MessageModel* source, const QList<BufferId>& buffers, QObject* parent)
     : QSortFilterProxyModel(parent)

-    , _validBuffers(buffers.toSet())
+    , _validBuffers(toQSet(buffers))

     , _messageTypeFilter(0)
 {
     init();
     , _messageTypeFilter(0)
 {
     init();


@@ -114,7 +115,7 @@ QString MessageFilter::idString() const
     if (_validBuffers.isEmpty())
         return "*";
 
     if (_validBuffers.isEmpty())
         return "*";
 

-    QList<BufferId> bufferIds = _validBuffers.toList();
+    QList<BufferId> bufferIds = _validBuffers.values();

     std::sort(bufferIds.begin(), bufferIds.end());
 
     QStringList bufferIdStrings;
     std::sort(bufferIds.begin(), bufferIds.end());
 
     QStringList bufferIdStrings;