diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-12 11:06:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 01:10:37 +0200 |
commit | 4df73e62a70b73d955ab53faef4615ea03a21a4d (patch) | |
tree | 00acf9163a0447da03298659bc47d2de9da509f7 /tests | |
parent | c1821de0e6ef21f86623572fd54f5cc5451b6077 (diff) |
Remove qSort usages from declarative
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
3 files changed, 12 insertions, 7 deletions
diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp index bf76c07970..634a6e5df1 100644 --- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp +++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp @@ -48,6 +48,8 @@ #include <private/qqmldirparser_p.h> #include <QDebug> +#include <algorithm> + // Test the parsing of qmldir files class tst_qqmldirparser : public QQmlDataTest @@ -104,7 +106,7 @@ namespace { foreach (const QQmlDirParser::Component &c, components.values()) rv.append(toString(c)); - qSort(rv); + std::sort(rv.begin(), rv.end()); return rv; } diff --git a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp index 1f7a8029dc..12ae3c273f 100644 --- a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp +++ b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp @@ -58,6 +58,8 @@ #include <QtQml/qqmlcomponent.h> #include "../../../../src/imports/xmllistmodel/qqmlxmllistmodel_p.h" +#include <algorithm> + typedef QPair<int, int> QQuickXmlListRange; typedef QList<QVariantList> QQmlXmlModelData; @@ -608,7 +610,7 @@ void tst_qquickxmllistmodel::useKeys() } QList<int> roles = model->roleNames().keys(); - qSort(roles); + std::sort(roles.begin(), roles.end()); for (int i=0; i<model->rowCount(); i++) { QModelIndex index = model->index(i, 0); for (int j=0; j<roles.count(); j++) @@ -759,7 +761,7 @@ void tst_qquickxmllistmodel::noKeysValueChanges() model->setProperty("xml",xml); QList<int> roles = model->roleNames().keys(); - qSort(roles); + std::sort(roles.begin(), roles.end()); // wait for the new xml data to be set, and verify no signals were emitted QTRY_VERIFY(model->data(model->index(0, 0), roles.at(2)).toString() != QLatin1String("Football")); QCOMPARE(model->data(model->index(0, 0), roles.at(2)).toString(), QLatin1String("AussieRules")); @@ -860,21 +862,21 @@ void tst_qquickxmllistmodel::threading() for (int i=0; i<dataCount; i++) { QModelIndex index = m1->index(i, 0); QList<int> roles = m1->roleNames().keys(); - qSort(roles); + std::sort(roles.begin(), roles.end()); QCOMPARE(m1->data(index, roles.at(0)).toString(), QString("A" + QString::number(i))); QCOMPARE(m1->data(index, roles.at(1)).toString(), QString("1" + QString::number(i))); QCOMPARE(m1->data(index, roles.at(2)).toString(), QString("Football")); index = m2->index(i, 0); roles = m2->roleNames().keys(); - qSort(roles); + std::sort(roles.begin(), roles.end()); QCOMPARE(m2->data(index, roles.at(0)).toString(), QString("B" + QString::number(i))); QCOMPARE(m2->data(index, roles.at(1)).toString(), QString("2" + QString::number(i))); QCOMPARE(m2->data(index, roles.at(2)).toString(), QString("Athletics")); index = m3->index(i, 0); roles = m3->roleNames().keys(); - qSort(roles); + std::sort(roles.begin(), roles.end()); QCOMPARE(m3->data(index, roles.at(0)).toString(), QString("C" + QString::number(i))); QCOMPARE(m3->data(index, roles.at(1)).toString(), QString("3" + QString::number(i))); QCOMPARE(m3->data(index, roles.at(2)).toString(), QString("Curling")); diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp index 74845ab954..cb0f44a03e 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp +++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp @@ -47,6 +47,7 @@ #include <QtCore/QProcess> #include <QtGui/QImage> +#include <algorithm> QString blockify(const QByteArray& s) { @@ -167,7 +168,7 @@ void tst_Scenegraph::setupTestSuite(const QByteArray& filter) } } - qSort(itemFiles); + std::sort(itemFiles.begin(), itemFiles.end()); foreach (const QString &filePath, itemFiles) { QByteArray itemName = filePath.mid(testSuitePath.length() + 1).toLatin1(); QBaselineTest::newRow(itemName, checksumFileOrDir(filePath)) << filePath; |