github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-06 05:01:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename literal operator

Browse source 
Qt 6.4 introduced `QString operator""_s()` and the previous `""_qs` is
deprecated since Qt 6.8.
This commit is contained in:
Chocobo1 2023-06-18 02:02:02 +08:00
parent f6b58f36e2
commit e6d85a468b
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
141 changed files with 3610 additions and 3604 deletions
Download patch file Download diff file Expand all files Collapse all files

80
test/testorderedset.cpp
View file

@ -45,20 +45,20 @@ private slots:
#if __cplusplus < 202002L
void testContains() const
{
const OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
QVERIFY(set.contains(u"a"_qs));
QVERIFY(set.contains(u"b"_qs));
QVERIFY(set.contains(u"c"_qs));
QVERIFY(!set.contains(u"z"_qs));
const OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QVERIFY(set.contains(u"a"_s));
QVERIFY(set.contains(u"b"_s));
QVERIFY(set.contains(u"c"_s));
QVERIFY(!set.contains(u"z"_s));
const OrderedSet<QString> emptySet;
QVERIFY(!emptySet.contains(u"a"_qs));
QVERIFY(!emptySet.contains(u"a"_s));
}
#endif
void testCount() const
{
const OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs, u"c"_qs};
const OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s, u"c"_s};
QCOMPARE(set.count(), 3);
const OrderedSet<QString> emptySet;
@ -67,19 +67,19 @@ private slots:
void testIntersect() const
{
OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
set.intersect({u"c"_qs, u"a"_qs});
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
set.intersect({u"c"_s, u"a"_s});
QCOMPARE(set.size(), 2);
QCOMPARE(set.join(u","_qs), u"a,c"_qs);
QCOMPARE(set.join(u","_s), u"a,c"_s);
OrderedSet<QString> emptySet;
emptySet.intersect({u"a"_qs}).intersect({u"c"_qs});;
emptySet.intersect({u"a"_s}).intersect({u"c"_s});;
QVERIFY(emptySet.isEmpty());
}
void testIsEmpty() const
{
const OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
const OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QVERIFY(!set.isEmpty());
const OrderedSet<QString> emptySet;
@ -88,62 +88,62 @@ private slots:
void testJoin() const
{
const OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
QCOMPARE(set.join(u","_qs), u"a,b,c"_qs);
const OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QCOMPARE(set.join(u","_s), u"a,b,c"_s);
const OrderedSet<QString> emptySet;
QCOMPARE(emptySet.join(u","_qs), u""_qs);
QCOMPARE(emptySet.join(u","_s), u""_s);
}
void testRemove() const
{
OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
QVERIFY(!set.remove(u"z"_qs));
QCOMPARE(set.join(u","_qs), u"a,b,c"_qs);
QVERIFY(set.remove(u"b"_qs));
QCOMPARE(set.join(u","_qs), u"a,c"_qs);
QVERIFY(set.remove(u"a"_qs));
QCOMPARE(set.join(u","_qs), u"c"_qs);
QVERIFY(set.remove(u"c"_qs));
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QVERIFY(!set.remove(u"z"_s));
QCOMPARE(set.join(u","_s), u"a,b,c"_s);
QVERIFY(set.remove(u"b"_s));
QCOMPARE(set.join(u","_s), u"a,c"_s);
QVERIFY(set.remove(u"a"_s));
QCOMPARE(set.join(u","_s), u"c"_s);
QVERIFY(set.remove(u"c"_s));
QVERIFY(set.isEmpty());
OrderedSet<QString> emptySet;
QVERIFY(!emptySet.remove(u"a"_qs));
QVERIFY(!emptySet.remove(u"a"_s));
QVERIFY(emptySet.isEmpty());
}
void testUnite() const
{
const OrderedSet<QString> newData1 {u"z"_qs};
const OrderedSet<QString> newData2 {u"y"_qs};
const QSet<QString> newData3 {u"c"_qs, u"d"_qs, u"e"_qs};
const OrderedSet<QString> newData1 {u"z"_s};
const OrderedSet<QString> newData2 {u"y"_s};
const QSet<QString> newData3 {u"c"_s, u"d"_s, u"e"_s};
OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
set.unite(newData1);
QCOMPARE(set.join(u","_qs), u"a,b,c,z"_qs);
QCOMPARE(set.join(u","_s), u"a,b,c,z"_s);
set.unite(newData2);
QCOMPARE(set.join(u","_qs), u"a,b,c,y,z"_qs);
QCOMPARE(set.join(u","_s), u"a,b,c,y,z"_s);
set.unite(newData3);
QCOMPARE(set.join(u","_qs), u"a,b,c,d,e,y,z"_qs);
QCOMPARE(set.join(u","_s), u"a,b,c,d,e,y,z"_s);
OrderedSet<QString> emptySet;
emptySet.unite(newData1).unite(newData2).unite(newData3);
QCOMPARE(emptySet.join(u","_qs), u"c,d,e,y,z"_qs);
QCOMPARE(emptySet.join(u","_s), u"c,d,e,y,z"_s);
}
void testUnited() const
{
const OrderedSet<QString> newData1 {u"z"_qs};
const OrderedSet<QString> newData2 {u"y"_qs};
const QSet<QString> newData3 {u"c"_qs, u"d"_qs, u"e"_qs};
const OrderedSet<QString> newData1 {u"z"_s};
const OrderedSet<QString> newData2 {u"y"_s};
const QSet<QString> newData3 {u"c"_s, u"d"_s, u"e"_s};
OrderedSet<QString> set {u"a"_qs, u"b"_qs, u"c"_qs};
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QCOMPARE(set.united(newData1).join(u","_qs), u"a,b,c,z"_qs);
QCOMPARE(set.united(newData2).join(u","_qs), u"a,b,c,y"_qs);
QCOMPARE(set.united(newData3).join(u","_qs), u"a,b,c,d,e"_qs);
QCOMPARE(set.united(newData1).join(u","_s), u"a,b,c,z"_s);
QCOMPARE(set.united(newData2).join(u","_s), u"a,b,c,y"_s);
QCOMPARE(set.united(newData3).join(u","_s), u"a,b,c,d,e"_s);
QCOMPARE(OrderedSet<QString>().united(newData1).united(newData2).united(newData3).join(u","_qs), u"c,d,e,y,z"_qs);
QCOMPARE(OrderedSet<QString>().united(newData1).united(newData2).united(newData3).join(u","_s), u"c,d,e,y,z"_s);
}
};