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>

11 files changed, 40 insertions, 36 deletions

diff --git a/src/contacts/filters/qcontactcollectionfilter_p.h b/src/contacts/filters/qcontactcollectionfilter_p.h
index 5e3165664..318cb5f67 100644
--- a/src/contacts/filters/qcontactcollectionfilter_p.h
+++ b/src/contacts/filters/qcontactcollectionfilter_p.h
@@ -100,7 +100,7 @@ public:
     QDebug &debugStreamOut(QDebug &dbg) const
     {
         dbg.nospace() << "QContactCollectionFilter(collectionIds=";
-        QList<QContactCollectionId> ids(m_ids.toList());
+        QList<QContactCollectionId> ids(m_ids.values());
         std::sort(ids.begin(), ids.end());
         dbg.nospace() << ids;
         dbg.nospace() << ")";
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index 4e93ab055..c94d90487 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -180,7 +180,7 @@ QStringList QContactAction::availableActions(const QString& serviceName)
         }
     }
 
-    return ret.toList();
+    return ret.values();
 }
 
 
diff --git a/src/contacts/qcontactchangeset.cpp b/src/contacts/qcontactchangeset.cpp
index 16e474c95..74fec162e 100644
--- a/src/contacts/qcontactchangeset.cpp
+++ b/src/contacts/qcontactchangeset.cpp
@@ -406,18 +406,18 @@ void QContactChangeSet::emitSignals(QContactManagerEngine *engine) const
         emit engine->dataChanged();
     } else {
         if (!d->m_addedContacts.isEmpty())
-            emit engine->contactsAdded(d->m_addedContacts.toList());
+            emit engine->contactsAdded(d->m_addedContacts.values());
         if (!d->m_changedContacts.isEmpty()) {
             QList<ContactChangeList>::const_iterator it = d->m_changedContacts.constBegin(), end = d->m_changedContacts.constEnd();
             for ( ; it != end; ++it)
                 emit engine->contactsChanged((*it).second, (*it).first);
         }
         if (!d->m_removedContacts.isEmpty())
-            emit engine->contactsRemoved(d->m_removedContacts.toList());
+            emit engine->contactsRemoved(d->m_removedContacts.values());
         if (!d->m_addedRelationships.isEmpty())
-            emit engine->relationshipsAdded(d->m_addedRelationships.toList());
+            emit engine->relationshipsAdded(d->m_addedRelationships.values());
         if (!d->m_removedRelationships.isEmpty())
-            emit engine->relationshipsRemoved(d->m_removedRelationships.toList());
+            emit engine->relationshipsRemoved(d->m_removedRelationships.values());
         if (d->m_oldAndNewSelfContactId.first != d->m_oldAndNewSelfContactId.second)
             emit engine->selfContactIdChanged(d->m_oldAndNewSelfContactId.first, d->m_oldAndNewSelfContactId.second);
     }
diff --git a/src/contacts/qcontactcollectionchangeset.cpp b/src/contacts/qcontactcollectionchangeset.cpp
index 5f0fb1620..69e8f7730 100644
--- a/src/contacts/qcontactcollectionchangeset.cpp
+++ b/src/contacts/qcontactcollectionchangeset.cpp
@@ -263,11 +263,11 @@ void QContactCollectionChangeSet::emitSignals(QContactManagerEngine *engine) con
         emit engine->dataChanged();
     } else {
         if (!d->m_addedCollections.isEmpty())
-            emit engine->collectionsAdded(d->m_addedCollections.toList());
+            emit engine->collectionsAdded(d->m_addedCollections.values());
         if (!d->m_changedCollections.isEmpty())
-            emit engine->collectionsChanged(d->m_changedCollections.toList());
+            emit engine->collectionsChanged(d->m_changedCollections.values());
         if (!d->m_removedCollections.isEmpty())
-            emit engine->collectionsRemoved(d->m_removedCollections.toList());
+            emit engine->collectionsRemoved(d->m_removedCollections.values());
         if (!d->m_modifiedCollections.isEmpty())
             emit engine->collectionsModified(d->m_modifiedCollections);
 
diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index ebc96a89e..670fb0ecc 100644
--- a/src/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
@@ -2328,7 +2328,7 @@ bool QContactManagerEngine::saveContacts(QList<QContact> *contacts, const QList<
         // Prepare the list to save
         QList<QContact> contactsToSave;
         QList<int> savedToOriginalMap; // contactsToSave index to contacts index
-        QSet<QContactDetail::DetailType> mask = typeMask.toSet();
+        QSet<QContactDetail::DetailType> mask(typeMask.begin(), typeMask.end());
 
         for (int i = 0; i < contacts->count(); i++) {
             // See if this is an existing contact or a new one
diff --git a/src/organizer/filters/qorganizeritemcollectionfilter_p.h b/src/organizer/filters/qorganizeritemcollectionfilter_p.h
index 34b7a1ce3..d290948eb 100644
--- a/src/organizer/filters/qorganizeritemcollectionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemcollectionfilter_p.h
@@ -99,7 +99,7 @@ public:
     QDebug &debugStreamOut(QDebug &dbg) const
     {
         dbg.nospace() << "QOrganizerItemCollectionFilter(collectionIds=";
-        QList<QOrganizerCollectionId> ids(m_ids.toList());
+        QList<QOrganizerCollectionId> ids(m_ids.values());
         std::sort(ids.begin(), ids.end());
         dbg.nospace() << ids;
         dbg.nospace() << ")";
diff --git a/src/organizer/qorganizercollectionchangeset.cpp b/src/organizer/qorganizercollectionchangeset.cpp
index 1ae125869..83f77f29f 100644
--- a/src/organizer/qorganizercollectionchangeset.cpp
+++ b/src/organizer/qorganizercollectionchangeset.cpp
@@ -262,11 +262,11 @@ void QOrganizerCollectionChangeSet::emitSignals(QOrganizerManagerEngine *engine)
         emit engine->dataChanged();
     } else {
         if (!d->m_addedCollections.isEmpty())
-            emit engine->collectionsAdded(d->m_addedCollections.toList());
+            emit engine->collectionsAdded(d->m_addedCollections.values());
         if (!d->m_changedCollections.isEmpty())
-            emit engine->collectionsChanged(d->m_changedCollections.toList());
+            emit engine->collectionsChanged(d->m_changedCollections.values());
         if (!d->m_removedCollections.isEmpty())
-            emit engine->collectionsRemoved(d->m_removedCollections.toList());
+            emit engine->collectionsRemoved(d->m_removedCollections.values());
         if (!d->m_modifiedCollections.isEmpty())
             emit engine->collectionsModified(d->m_modifiedCollections);
 
diff --git a/src/organizer/qorganizeritemchangeset.cpp b/src/organizer/qorganizeritemchangeset.cpp
index 5758f2d7c..27e919ed7 100644
--- a/src/organizer/qorganizeritemchangeset.cpp
+++ b/src/organizer/qorganizeritemchangeset.cpp
@@ -325,14 +325,14 @@ void QOrganizerItemChangeSet::emitSignals(QOrganizerManagerEngine *engine) const
         emit engine->dataChanged();
     } else {
         if (!d->m_addedItems.isEmpty())
-            emit engine->itemsAdded(d->m_addedItems.toList());
+            emit engine->itemsAdded(d->m_addedItems.values());
         if (!d->m_changedItems.isEmpty()) {
             QList<ItemChangeList>::const_iterator it = d->m_changedItems.constBegin(), end = d->m_changedItems.constEnd();
             for ( ; it != end; ++it)
                 emit engine->itemsChanged((*it).second, (*it).first);
         }
         if (!d->m_removedItems.isEmpty())
-            emit engine->itemsRemoved(d->m_removedItems.toList());
+            emit engine->itemsRemoved(d->m_removedItems.values());
         if (!d->m_modifiedItems.isEmpty())
             emit engine->itemsModified(d->m_modifiedItems);
     }
diff --git a/src/organizer/qorganizerrecurrencerule.cpp b/src/organizer/qorganizerrecurrencerule.cpp
index e33fd55c5..c5c30e576 100644
--- a/src/organizer/qorganizerrecurrencerule.cpp
+++ b/src/organizer/qorganizerrecurrencerule.cpp
@@ -555,7 +555,7 @@ QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule &rule)
         break;
     }
     dbg.nospace() << ",daysOfWeek=\"";
-    QList<Qt::DayOfWeek> wdays(rule.daysOfWeek().toList());
+    QList<Qt::DayOfWeek> wdays(rule.daysOfWeek().values());
     std::sort(wdays.begin(), wdays.end());
     foreach (Qt::DayOfWeek day, wdays) {
         dbg.nospace() << static_cast<quint32>(day);
@@ -564,7 +564,7 @@ QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule &rule)
     dbg.nospace() << "\"";
 
     dbg.nospace() << ",daysOfMonth=\"";
-    QList<int> mdays(rule.daysOfMonth().toList());
+    QList<int> mdays(rule.daysOfMonth().values());
     std::sort(mdays.begin(), mdays.end());
     foreach (int day, mdays) {
         dbg.nospace() << day;
@@ -573,7 +573,7 @@ QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule &rule)
     dbg.nospace() << "\"";
 
     dbg.nospace() << ",daysOfYear=\"";
-    QList<int> ydays(rule.daysOfYear().toList());
+    QList<int> ydays(rule.daysOfYear().values());
     std::sort(ydays.begin(), ydays.end());
     foreach (int day, ydays) {
         dbg.nospace() << day;
@@ -582,7 +582,7 @@ QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule &rule)
     dbg.nospace() << "\"";
 
     dbg.nospace() << ",monthsOfYear=\"";
-    QList<QOrganizerRecurrenceRule::Month> months(rule.monthsOfYear().toList());
+    QList<QOrganizerRecurrenceRule::Month> months(rule.monthsOfYear().values());
     std::sort(months.begin(), months.end());
     foreach (QOrganizerRecurrenceRule::Month month, months) {
         dbg.nospace() << static_cast<quint32>(month);
@@ -591,7 +591,7 @@ QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule &rule)
     dbg.nospace() << "\"";
 
     dbg.nospace() << ",positions=\"";
-    QList<int> positions(rule.positions().toList());
+    QList<int> positions(rule.positions().values());
     std::sort(positions.begin(), positions.end());
     foreach (int position, positions) {
         dbg.nospace() << position;
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();