Deprecation fix: conversions between QList and QSet

Replace QSet's toList() with values() and QList::toSet() with suitable
QSet construction from begin()/end().

Change-Id: Ibb815ff5043640aad1cb1feeb6391824db5d108f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>

2 files changed, 19 insertions, 15 deletions

diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
index 247365483..d0fb0f44d 100644
--- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
+++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
@@ -2132,13 +2132,12 @@ void tst_QContactManager::changeSet()
     QSet<QContactId> changedIds;
     QSet<QContactDetail::DetailType> changedTypes;
     foreach (const QContactChangeSet::ContactChangeList &changes, changeSet.changedContacts()) {
-        changedIds |= changes.second.toSet();
-        if (changes.second.contains(id)) {
-            changedTypes |= changes.first.toSet();
-        }
+        changedIds |= QSet<QContactId>(changes.second.constBegin(), changes.second.constEnd());
+        if (changes.second.contains(id))
+            changedTypes |= QSet<QContactId>(changes.first.constBegin(), changes.first.constEnd());
     }
-    QCOMPARE(changedIds, (QList<QContactId>() << id).toSet());
-    QCOMPARE(changedTypes, (QList<QContactDetail::DetailType>() << QContactName::Type << QContactBirthday::Type).toSet());
+    QCOMPARE(changedIds, (QSet<QContactId>() << id));
+    QCOMPARE(changedTypes, (QSet<QContactDetail::DetailType>() << QContactName::Type << QContactBirthday::Type));
     changeSet.clearChangedContacts();
     QVERIFY(changeSet.changedContacts().isEmpty());
 
@@ -2150,7 +2149,8 @@ void tst_QContactManager::changeSet()
     changeSet.insertChangedContacts(l1, QList<QContactDetail::DetailType>() << QContactName::Type << QContactBirthday::Type);
     changeSet.insertChangedContacts(l2, QList<QContactDetail::DetailType>() << QContactBirthday::Type << QContactName::Type << QContactBirthday::Type);
     QCOMPARE(changeSet.changedContacts().size(), 1);
-    QList<QContactId> expected((l1.toSet() | l2.toSet()).toList());
+    QList<QContactId> expected((QSet<QContactId>(l1.constBegin(), l1.constEnd())
+                                | QSet<QContactId>(l2.constBegin(), l2.constEnd())).values());
     qSort(expected);
     QCOMPARE(changeSet.changedContacts().first().second, expected);
 
@@ -2167,7 +2167,7 @@ void tst_QContactManager::changeSet()
 
     changeSet2.clearAddedContacts();
     QVERIFY(changeSet2.addedContacts().isEmpty());
-    changeSet2.insertAddedContacts(changeSet.addedContacts().toList());
+    changeSet2.insertAddedContacts(changeSet.addedContacts().values());
     QVERIFY(changeSet.addedContacts() == changeSet2.addedContacts());
 
     changeSet2.clearAll();
diff --git a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
index 0e0f03f94..34d10d441 100644
--- a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
+++ b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
@@ -2733,13 +2733,15 @@ void tst_QOrganizerManager::changeSet()
     QSet<QOrganizerItemId> changedIds;
     QSet<QOrganizerItemDetail::DetailType> changedTypes;
     foreach (const QOrganizerItemChangeSet::ItemChangeList &changes, changeSet.changedItems()) {
-        changedIds |= changes.second.toSet();
+        changedIds |= QSet<QOrganizerItemId>(changes.second.constBegin(),
+                                             changes.second.constEnd());
         if (changes.second.contains(id)) {
-            changedTypes |= changes.first.toSet();
+            changedTypes |= QSet<QOrganizerItemId>(changes.first.constBegin(),
+                                                   changes.first.constEnd());
         }
     }
-    QCOMPARE(changedIds, (QList<QOrganizerItemId>() << id).toSet());
-    QCOMPARE(changedTypes, (QList<QOrganizerItemDetail::DetailType>() << QOrganizerItemDetail::TypeDescription << QOrganizerItemDetail::TypeTag).toSet());
+    QCOMPARE(changedIds, (QSet<QOrganizerItemId>() << id));
+    QCOMPARE(changedTypes, (QSet<QOrganizerItemDetail::DetailType>() << QOrganizerItemDetail::TypeDescription << QOrganizerItemDetail::TypeTag));
     changeSet.clearChangedItems();
     QVERIFY(changeSet.changedItems().isEmpty());
 
@@ -2751,7 +2753,9 @@ void tst_QOrganizerManager::changeSet()
     changeSet.insertChangedItems(l1, QList<QOrganizerItemDetail::DetailType>() << QOrganizerItemDetail::TypeDescription << QOrganizerItemDetail::TypeTag);
     changeSet.insertChangedItems(l2, QList<QOrganizerItemDetail::DetailType>() << QOrganizerItemDetail::TypeTag << QOrganizerItemDetail::TypeDescription << QOrganizerItemDetail::TypeTag);
     QCOMPARE(changeSet.changedItems().size(), 1);
-    QList<QOrganizerItemId> expected((l1.toSet() | l2.toSet()).toList());
+    QList<QOrganizerItemId> expected(
+        (QSet<QOrganizerItemId>(l1.constBegin(), l1.constEnd())
+         | QSet<QOrganizerItemId>(l2.constBegin(), l2.constEnd())).values());
     qSort(expected);
     QCOMPARE(changeSet.changedItems().first().second, expected);
 
@@ -2768,7 +2772,7 @@ void tst_QOrganizerManager::changeSet()
 
     changeSet2.clearAddedItems();
     QVERIFY(changeSet2.addedItems().isEmpty());
-    changeSet2.insertAddedItems(changeSet.addedItems().toList());
+    changeSet2.insertAddedItems(changeSet.addedItems().values());
     QVERIFY(changeSet.addedItems() == changeSet2.addedItems());
 
     changeSet2.clearAll();
@@ -2822,7 +2826,7 @@ void tst_QOrganizerManager::changeSet()
 
     colChangeSet2.clearAddedCollections();
     QVERIFY(colChangeSet2.addedCollections().isEmpty());
-    colChangeSet2.insertAddedCollections(colChangeSet.addedCollections().toList());
+    colChangeSet2.insertAddedCollections(colChangeSet.addedCollections().values());
     QVERIFY(colChangeSet.addedCollections() == colChangeSet2.addedCollections());
 
     colChangeSet2.clearAll();