Port away from toList() and toSet()

These are already removed in dev.

Change-Id: I1614d821f5320a27d0b83743e1389a5c91d15464
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/compareresults/main.cpp b/tools/compareresults/main.cpp
index d37e390..56da1a5 100644
--- a/tools/compareresults/main.cpp
+++ b/tools/compareresults/main.cpp
@@ -128,18 +128,18 @@ int main(int argc, char **argv)
     const QSet<QString> unrelatedKeys{"command-line", "id", "opengl", "os", "qt", "windowSize"};
 
     auto filter = [&unrelatedKeys](const QStringList &list) -> QStringList {
-        return list.toSet().subtract(unrelatedKeys).toList();
+        return QSet<QString>(list.cbegin(), list.cend()).subtract(unrelatedKeys).values();
     };
 
     QStringList tests = filter(baseLine.keys());
     QStringList newResultKeys = filter(newResults.keys());
     if (tests != newResultKeys) {
-        QSet<QString> baseLineSet = tests.toSet();
-        QSet<QString> resultsSet = newResultKeys.toSet();
+        QSet<QString> baseLineSet(tests.cbegin(), tests.cend());
+        QSet<QString> resultsSet(newResultKeys.cbegin(), newResultKeys.cend());
 
         qWarning("Error: The two result files do not cover the same set of tests");
-        qWarning("Tests existing in the base line but missing from the new results: %s", qPrintable(baseLineSet.subtract(resultsSet).toList().join("\t\n")));
-        qWarning("Tests existing in the new results but missing from the base line: %s", qPrintable(resultsSet.subtract(baseLineSet).toList().join("\t\n")));
+        qWarning("Tests existing in the base line but missing from the new results: %s", qPrintable(baseLineSet.subtract(resultsSet).values().join("\t\n")));
+        qWarning("Tests existing in the new results but missing from the base line: %s", qPrintable(resultsSet.subtract(baseLineSet).values().join("\t\n")));
 
         return EXIT_FAILURE;
     }