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

62
test/testutilscompare.cpp
View file

@ -53,48 +53,48 @@ namespace
const TestData testData[] =
{
{u""_qs, u""_qs, CompareResult::Equal, CompareResult::Equal},
{u""_qs, u"a"_qs, CompareResult::Less, CompareResult::Less},
{u"a"_qs, u""_qs, CompareResult::Greater, CompareResult::Greater},
{u""_s, u""_s, CompareResult::Equal, CompareResult::Equal},
{u""_s, u"a"_s, CompareResult::Less, CompareResult::Less},
{u"a"_s, u""_s, CompareResult::Greater, CompareResult::Greater},
{u"a"_qs, u"a"_qs, CompareResult::Equal, CompareResult::Equal},
{u"A"_qs, u"a"_qs, CompareResult::Equal, CompareResult::Less}, // ascii code of 'A' is smaller than 'a'
{u"a"_qs, u"A"_qs, CompareResult::Equal, CompareResult::Greater},
{u"a"_s, u"a"_s, CompareResult::Equal, CompareResult::Equal},
{u"A"_s, u"a"_s, CompareResult::Equal, CompareResult::Less}, // ascii code of 'A' is smaller than 'a'
{u"a"_s, u"A"_s, CompareResult::Equal, CompareResult::Greater},
{u"0"_qs, u"0"_qs, CompareResult::Equal, CompareResult::Equal},
{u"1"_qs, u"0"_qs, CompareResult::Greater, CompareResult::Greater},
{u"0"_qs, u"1"_qs, CompareResult::Less, CompareResult::Less},
{u"0"_s, u"0"_s, CompareResult::Equal, CompareResult::Equal},
{u"1"_s, u"0"_s, CompareResult::Greater, CompareResult::Greater},
{u"0"_s, u"1"_s, CompareResult::Less, CompareResult::Less},
{u"😀"_qs, u"😀"_qs, CompareResult::Equal, CompareResult::Equal},
{u"😀"_qs, u"😁"_qs, CompareResult::Less, CompareResult::Less},
{u"😁"_qs, u"😀"_qs, CompareResult::Greater, CompareResult::Greater},
{u"😀"_s, u"😀"_s, CompareResult::Equal, CompareResult::Equal},
{u"😀"_s, u"😁"_s, CompareResult::Less, CompareResult::Less},
{u"😁"_s, u"😀"_s, CompareResult::Greater, CompareResult::Greater},
{u"a1"_qs, u"a1"_qs, CompareResult::Equal, CompareResult::Equal},
{u"A1"_qs, u"a1"_qs, CompareResult::Equal, CompareResult::Less},
{u"a1"_qs, u"A1"_qs, CompareResult::Equal, CompareResult::Greater},
{u"a1"_s, u"a1"_s, CompareResult::Equal, CompareResult::Equal},
{u"A1"_s, u"a1"_s, CompareResult::Equal, CompareResult::Less},
{u"a1"_s, u"A1"_s, CompareResult::Equal, CompareResult::Greater},
{u"a1"_qs, u"a2"_qs, CompareResult::Less, CompareResult::Less},
{u"A1"_qs, u"a2"_qs, CompareResult::Less, CompareResult::Less},
{u"a1"_qs, u"A2"_qs, CompareResult::Less, CompareResult::Greater},
{u"A1"_qs, u"A2"_qs, CompareResult::Less, CompareResult::Less},
{u"a1"_s, u"a2"_s, CompareResult::Less, CompareResult::Less},
{u"A1"_s, u"a2"_s, CompareResult::Less, CompareResult::Less},
{u"a1"_s, u"A2"_s, CompareResult::Less, CompareResult::Greater},
{u"A1"_s, u"A2"_s, CompareResult::Less, CompareResult::Less},
{u"abc100"_qs, u"abc99"_qs, CompareResult::Greater, CompareResult::Greater},
{u"ABC100"_qs, u"abc99"_qs, CompareResult::Greater, CompareResult::Less},
{u"abc100"_qs, u"ABC99"_qs, CompareResult::Greater, CompareResult::Greater},
{u"ABC100"_qs, u"ABC99"_qs, CompareResult::Greater, CompareResult::Greater},
{u"abc100"_s, u"abc99"_s, CompareResult::Greater, CompareResult::Greater},
{u"ABC100"_s, u"abc99"_s, CompareResult::Greater, CompareResult::Less},
{u"abc100"_s, u"ABC99"_s, CompareResult::Greater, CompareResult::Greater},
{u"ABC100"_s, u"ABC99"_s, CompareResult::Greater, CompareResult::Greater},
{u"100abc"_qs, u"99abc"_qs, CompareResult::Greater, CompareResult::Greater},
{u"100ABC"_qs, u"99abc"_qs, CompareResult::Greater, CompareResult::Greater},
{u"100abc"_qs, u"99ABC"_qs, CompareResult::Greater, CompareResult::Greater},
{u"100ABC"_qs, u"99ABC"_qs, CompareResult::Greater, CompareResult::Greater},
{u"100abc"_s, u"99abc"_s, CompareResult::Greater, CompareResult::Greater},
{u"100ABC"_s, u"99abc"_s, CompareResult::Greater, CompareResult::Greater},
{u"100abc"_s, u"99ABC"_s, CompareResult::Greater, CompareResult::Greater},
{u"100ABC"_s, u"99ABC"_s, CompareResult::Greater, CompareResult::Greater},
{u"😀😀😀99"_qs, u"😀😀😀100"_qs, CompareResult::Less, CompareResult::Less},
{u"😀😀😀100"_qs, u"😀😀😀99"_qs, CompareResult::Greater, CompareResult::Greater}
{u"😀😀😀99"_s, u"😀😀😀100"_s, CompareResult::Less, CompareResult::Less},
{u"😀😀😀100"_s, u"😀😀😀99"_s, CompareResult::Greater, CompareResult::Greater}
};
void testCompare(const TestData &data, const int actual, const CompareResult expected)
{
const auto errorMessage = u"Wrong result. LHS: \"%1\". RHS: \"%2\". Result: %3"_qs
const auto errorMessage = u"Wrong result. LHS: \"%1\". RHS: \"%2\". Result: %3"_s
.arg(data.lhs, data.rhs, QString::number(actual));
switch (expected)
@ -116,7 +116,7 @@ namespace
void testLessThan(const TestData &data, const bool actual, const CompareResult expected)
{
const auto errorMessage = u"Wrong result. LHS: \"%1\". RHS: \"%2\". Result: %3"_qs
const auto errorMessage = u"Wrong result. LHS: \"%1\". RHS: \"%2\". Result: %3"_s
.arg(data.lhs, data.rhs, QString::number(actual));
switch (expected)