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

42
test/testutilsversion.cpp
View file

@ -130,38 +130,38 @@ private slots:
void testToString() const
{
using OneMandatory = Utils::Version<2, 1>;
QCOMPARE(OneMandatory(10).toString(), u"10"_qs);
QCOMPARE(OneMandatory(2).toString(), u"2"_qs);
QCOMPARE(OneMandatory(2, 0).toString(), u"2"_qs);
QCOMPARE(OneMandatory(2, 2).toString(), u"2.2"_qs);
QCOMPARE(OneMandatory(10).toString(), u"10"_s);
QCOMPARE(OneMandatory(2).toString(), u"2"_s);
QCOMPARE(OneMandatory(2, 0).toString(), u"2"_s);
QCOMPARE(OneMandatory(2, 2).toString(), u"2.2"_s);
using FourDigits = Utils::Version<4>;
QCOMPARE(FourDigits(10, 11, 12, 13).toString(), u"10.11.12.13"_qs);
QCOMPARE(FourDigits(10, 11, 12, 13).toString(), u"10.11.12.13"_s);
}
void testFromString() const
{
using OneMandatory = Utils::Version<2, 1>;
const OneMandatory default1 {10, 11};
QCOMPARE(OneMandatory::fromString(u"1"_qs, default1), OneMandatory(1));
QCOMPARE(OneMandatory::fromString(u"1.2"_qs, default1), OneMandatory(1, 2));
QCOMPARE(OneMandatory::fromString(u"100.2000"_qs, default1), OneMandatory(100, 2000));
QCOMPARE(OneMandatory::fromString(u"1,2"_qs), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"1,2"_qs, default1), default1);
QCOMPARE(OneMandatory::fromString(u"1.2a"_qs), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"1.2.a"_qs), OneMandatory());
QCOMPARE(OneMandatory::fromString(u""_qs), OneMandatory());
QCOMPARE(OneMandatory::fromString(u""_qs, default1), default1);
QCOMPARE(OneMandatory::fromString(u"random_string"_qs), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"random_string"_qs, default1), default1);
QCOMPARE(OneMandatory::fromString(u"1"_s, default1), OneMandatory(1));
QCOMPARE(OneMandatory::fromString(u"1.2"_s, default1), OneMandatory(1, 2));
QCOMPARE(OneMandatory::fromString(u"100.2000"_s, default1), OneMandatory(100, 2000));
QCOMPARE(OneMandatory::fromString(u"1,2"_s), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"1,2"_s, default1), default1);
QCOMPARE(OneMandatory::fromString(u"1.2a"_s), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"1.2.a"_s), OneMandatory());
QCOMPARE(OneMandatory::fromString(u""_s), OneMandatory());
QCOMPARE(OneMandatory::fromString(u""_s, default1), default1);
QCOMPARE(OneMandatory::fromString(u"random_string"_s), OneMandatory());
QCOMPARE(OneMandatory::fromString(u"random_string"_s, default1), default1);
using FourDigits = Utils::Version<4, 3>;
const FourDigits default2 {10, 11, 12, 13};
QCOMPARE(FourDigits::fromString(u"1"_qs, default2), default2);
QCOMPARE(FourDigits::fromString(u"1.2"_qs), FourDigits());
QCOMPARE(FourDigits::fromString(u"1.2.3"_qs), FourDigits(1, 2, 3));
QCOMPARE(FourDigits::fromString(u"1.2.3.0"_qs), FourDigits(1, 2, 3));
QCOMPARE(FourDigits::fromString(u"1.2.3.4"_qs), FourDigits(1, 2, 3, 4));
QCOMPARE(FourDigits::fromString(u"1"_s, default2), default2);
QCOMPARE(FourDigits::fromString(u"1.2"_s), FourDigits());
QCOMPARE(FourDigits::fromString(u"1.2.3"_s), FourDigits(1, 2, 3));
QCOMPARE(FourDigits::fromString(u"1.2.3.0"_s), FourDigits(1, 2, 3));
QCOMPARE(FourDigits::fromString(u"1.2.3.4"_s), FourDigits(1, 2, 3, 4));
}
void testComparisons() const