From cb5342330258142a3487867cc8aa45afc0df54d6 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 15 Jan 2020 15:06:07 +0100 Subject: Port away from toList() and toSet() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are already removed in dev. Change-Id: I1614d821f5320a27d0b83743e1389a5c91d15464 Reviewed-by: Mårten Nordheim --- tools/compareresults/main.cpp | 10 +++++----- 1 file 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 unrelatedKeys{"command-line", "id", "opengl", "os", "qt", "windowSize"}; auto filter = [&unrelatedKeys](const QStringList &list) -> QStringList { - return list.toSet().subtract(unrelatedKeys).toList(); + return QSet(list.cbegin(), list.cend()).subtract(unrelatedKeys).values(); }; QStringList tests = filter(baseLine.keys()); QStringList newResultKeys = filter(newResults.keys()); if (tests != newResultKeys) { - QSet baseLineSet = tests.toSet(); - QSet resultsSet = newResultKeys.toSet(); + QSet baseLineSet(tests.cbegin(), tests.cend()); + QSet 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; } -- cgit v1.2.3