1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use deprecated API

Browse Source 
Change-Id: Ic56c22a1be5e69b371991c3e9ad98a1106848e78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2019-05-02 08:53:24 +02:00
parent f5de7896d7
commit f27f89f335
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/auto/corelib/tools/collections/tst_collections.cpp
View File

@ -580,73 +580,73 @@ void tst_Collections::list()
list1 << 0 << 1 << 2 << 3; list1 << 0 << 1 << 2 << 3;
list1.removeFirst(); list1.removeFirst();
list1.swap(0, 0); list1.swapItemsAt(0, 0);
QVERIFY(list1 == QList<int>() << 1 << 2 << 3); QVERIFY(list1 == QList<int>() << 1 << 2 << 3);
list1.swap(1, 1); list1.swapItemsAt(1, 1);
QVERIFY(list1 == QList<int>() << 1 << 2 << 3); QVERIFY(list1 == QList<int>() << 1 << 2 << 3);
list1.swap(2, 2); list1.swapItemsAt(2, 2);
QVERIFY(list1 == QList<int>() << 1 << 2 << 3); QVERIFY(list1 == QList<int>() << 1 << 2 << 3);
list1.swap(0, 1); list1.swapItemsAt(0, 1);
QVERIFY(list1 == QList<int>() << 2 << 1 << 3); QVERIFY(list1 == QList<int>() << 2 << 1 << 3);
list1.swap(0, 2); list1.swapItemsAt(0, 2);
QVERIFY(list1 == QList<int>() << 3 << 1 << 2); QVERIFY(list1 == QList<int>() << 3 << 1 << 2);
list1.swap(1, 2); list1.swapItemsAt(1, 2);
QVERIFY(list1 == QList<int>() << 3 << 2 << 1); QVERIFY(list1 == QList<int>() << 3 << 2 << 1);
list1.swap(1, 2); list1.swapItemsAt(1, 2);
QVERIFY(list1 == QList<int>() << 3 << 1 << 2); QVERIFY(list1 == QList<int>() << 3 << 1 << 2);
QList<QString> list2; QList<QString> list2;
list2 << "1" << "2" << "3"; list2 << "1" << "2" << "3";
list2.swap(0, 0); list2.swapItemsAt(0, 0);
QVERIFY(list2 == QList<QString>() << "1" << "2" << "3"); QVERIFY(list2 == QList<QString>() << "1" << "2" << "3");
list2.swap(1, 1); list2.swapItemsAt(1, 1);
QVERIFY(list2 == QList<QString>() << "1" << "2" << "3"); QVERIFY(list2 == QList<QString>() << "1" << "2" << "3");
list2.swap(2, 2); list2.swapItemsAt(2, 2);
QVERIFY(list2 == QList<QString>() << "1" << "2" << "3"); QVERIFY(list2 == QList<QString>() << "1" << "2" << "3");
list2.swap(0, 1); list2.swapItemsAt(0, 1);
QVERIFY(list2 == QList<QString>() << "2" << "1" << "3"); QVERIFY(list2 == QList<QString>() << "2" << "1" << "3");
list2.swap(0, 2); list2.swapItemsAt(0, 2);
QVERIFY(list2 == QList<QString>() << "3" << "1" << "2"); QVERIFY(list2 == QList<QString>() << "3" << "1" << "2");
list2.swap(1, 2); list2.swapItemsAt(1, 2);
QVERIFY(list2 == QList<QString>() << "3" << "2" << "1"); QVERIFY(list2 == QList<QString>() << "3" << "2" << "1");
list2.swap(1, 2); list2.swapItemsAt(1, 2);
QVERIFY(list2 == QList<QString>() << "3" << "1" << "2"); QVERIFY(list2 == QList<QString>() << "3" << "1" << "2");
QList<double> list3; QList<double> list3;
list3 << 1.0 << 2.0 << 3.0; list3 << 1.0 << 2.0 << 3.0;
list3.swap(0, 0); list3.swapItemsAt(0, 0);
QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0); QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0);
list3.swap(1, 1); list3.swapItemsAt(1, 1);
QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0); QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0);
list3.swap(2, 2); list3.swapItemsAt(2, 2);
QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0); QVERIFY(list3 == QList<double>() << 1.0 << 2.0 << 3.0);
list3.swap(0, 1); list3.swapItemsAt(0, 1);
QVERIFY(list3 == QList<double>() << 2.0 << 1.0 << 3.0); QVERIFY(list3 == QList<double>() << 2.0 << 1.0 << 3.0);
list3.swap(0, 2); list3.swapItemsAt(0, 2);
QVERIFY(list3 == QList<double>() << 3.0 << 1.0 << 2.0); QVERIFY(list3 == QList<double>() << 3.0 << 1.0 << 2.0);
list3.swap(1, 2); list3.swapItemsAt(1, 2);
QVERIFY(list3 == QList<double>() << 3.0 << 2.0 << 1.0); QVERIFY(list3 == QList<double>() << 3.0 << 2.0 << 1.0);
list3.swap(1, 2); list3.swapItemsAt(1, 2);
QVERIFY(list3 == QList<double>() << 3.0 << 1.0 << 2.0); QVERIFY(list3 == QList<double>() << 3.0 << 1.0 << 2.0);
} }

4
tests/auto/corelib/tools/qlist/tst_qlist.cpp
View File

@ -1457,11 +1457,11 @@ void tst_QList::swap() const
list << T_FOO << T_BAR << T_BAZ; list << T_FOO << T_BAR << T_BAZ;
// swap // swap
list.swap(0, 2); list.swapItemsAt(0, 2);
QCOMPARE(list, QList<T>() << T_BAZ << T_BAR << T_FOO); QCOMPARE(list, QList<T>() << T_BAZ << T_BAR << T_FOO);
// swap again // swap again
list.swap(1, 2); list.swapItemsAt(1, 2);
QCOMPARE(list, QList<T>() << T_BAZ << T_FOO << T_BAR); QCOMPARE(list, QList<T>() << T_BAZ << T_FOO << T_BAR);
QList<T> list2; QList<T> list2;