squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-01 13:18:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

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
141 changed files with 3610 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/base/net/dnsupdater.cpp
View File

@@ -78,7 +78,7 @@ void DNSUpdater::checkPublicIP()
Q_ASSERT(m_state == OK);
DownloadManager::instance()->download(
DownloadRequest(u"http://checkip.dyndns.org"_qs).userAgent(QStringLiteral("qBittorrent/" QBT_VERSION_2))
DownloadRequest(u"http://checkip.dyndns.org"_s).userAgent(QStringLiteral("qBittorrent/" QBT_VERSION_2))
, Preferences::instance()->useProxyForGeneralPurposes(), this, &DNSUpdater::ipRequestFinished);
m_lastIPCheckTime = QDateTime::currentDateTime();
@@ -93,7 +93,7 @@ void DNSUpdater::ipRequestFinished(const DownloadResult &result)
}
// Parse response
const QRegularExpressionMatch ipRegexMatch = QRegularExpression(u"Current IP Address:\\s+([^<]+)</body>"_qs).match(QString::fromUtf8(result.data));
const QRegularExpressionMatch ipRegexMatch = QRegularExpression(u"Current IP Address:\\s+([^<]+)</body>"_s).match(QString::fromUtf8(result.data));
if (ipRegexMatch.hasMatch())
{
QString ipStr = ipRegexMatch.captured(1);
@@ -134,9 +134,9 @@ QString DNSUpdater::getUpdateUrl() const
{
QUrl url;
#ifdef QT_NO_OPENSSL
url.setScheme(u"http"_qs);
url.setScheme(u"http"_s);
#else
url.setScheme(u"https"_qs);
url.setScheme(u"https"_s);
#endif
url.setUserName(m_username);
url.setPassword(m_password);
@@ -146,21 +146,21 @@ QString DNSUpdater::getUpdateUrl() const
switch (m_service)
{
case DNS::Service::DynDNS:
url.setHost(u"members.dyndns.org"_qs);
url.setHost(u"members.dyndns.org"_s);
break;
case DNS::Service::NoIP:
url.setHost(u"dynupdate.no-ip.com"_qs);
url.setHost(u"dynupdate.no-ip.com"_s);
break;
default:
qWarning() << "Unrecognized Dynamic DNS service!";
Q_ASSERT(false);
break;
}
url.setPath(u"/nic/update"_qs);
url.setPath(u"/nic/update"_s);
QUrlQuery urlQuery(url);
urlQuery.addQueryItem(u"hostname"_qs, m_domain);
urlQuery.addQueryItem(u"myip"_qs, m_lastIP.toString());
urlQuery.addQueryItem(u"hostname"_s, m_domain);
urlQuery.addQueryItem(u"myip"_s, m_lastIP.toString());
url.setQuery(urlQuery);
Q_ASSERT(url.isValid());
@@ -223,7 +223,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
if (code == u"!donator")
{
LogMsg(tr("Dynamic DNS error: %1 was returned by the service, please submit a bug report at https://bugs.qbittorrent.org.").arg(u"!donator"_qs),
LogMsg(tr("Dynamic DNS error: %1 was returned by the service, please submit a bug report at https://bugs.qbittorrent.org.").arg(u"!donator"_s),
Log::CRITICAL);
m_state = FATAL;
return;
@@ -250,7 +250,7 @@ void DNSUpdater::updateCredentials()
if (m_domain != pref->getDynDomainName())
{
m_domain = pref->getDynDomainName();
const QRegularExpressionMatch domainRegexMatch = QRegularExpression(u"^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$"_qs).match(m_domain);
const QRegularExpressionMatch domainRegexMatch = QRegularExpression(u"^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$"_s).match(m_domain);
if (!domainRegexMatch.hasMatch())
{
LogMsg(tr("Dynamic DNS error: supplied domain name is invalid."), Log::CRITICAL);
@@ -301,9 +301,9 @@ QUrl DNSUpdater::getRegistrationUrl(const DNS::Service service)
switch (service)
{
case DNS::Service::DynDNS:
return {u"https://account.dyn.com/entrance/"_qs};
return {u"https://account.dyn.com/entrance/"_s};
case DNS::Service::NoIP:
return {u"https://www.noip.com/remote-access"_qs};
return {u"https://www.noip.com/remote-access"_s};
default:
Q_ASSERT(false);
break;

34
src/base/net/geoipdatabase.cpp
View File

@@ -190,7 +190,7 @@ QString GeoIPDatabase::lookup(const QHostAddress &hostAddr) const
const QVariant val = readDataField(tmp);
if (val.userType() == QMetaType::QVariantHash)
{
country = val.toHash()[u"country"_qs].toHash()[u"iso_code"_qs].toString();
country = val.toHash()[u"country"_s].toHash()[u"iso_code"_s].toString();
m_countries[id] = country;
}
}
@@ -233,26 +233,26 @@ bool GeoIPDatabase::parseMetadata(const QVariantHash &metadata, QString &error)
qDebug() << "Parsing MaxMindDB metadata...";
CHECK_METADATA_REQ(u"binary_format_major_version"_qs, UShort);
CHECK_METADATA_REQ(u"binary_format_minor_version"_qs, UShort);
const uint versionMajor = metadata.value(u"binary_format_major_version"_qs).toUInt();
const uint versionMinor = metadata.value(u"binary_format_minor_version"_qs).toUInt();
CHECK_METADATA_REQ(u"binary_format_major_version"_s, UShort);
CHECK_METADATA_REQ(u"binary_format_minor_version"_s, UShort);
const uint versionMajor = metadata.value(u"binary_format_major_version"_s).toUInt();
const uint versionMinor = metadata.value(u"binary_format_minor_version"_s).toUInt();
if (versionMajor != 2)
{
error = tr("Unsupported database version: %1.%2").arg(versionMajor).arg(versionMinor);
return false;
}
CHECK_METADATA_REQ(u"ip_version"_qs, UShort);
m_ipVersion = metadata.value(u"ip_version"_qs).value<quint16>();
CHECK_METADATA_REQ(u"ip_version"_s, UShort);
m_ipVersion = metadata.value(u"ip_version"_s).value<quint16>();
if (m_ipVersion != 6)
{
error = tr("Unsupported IP version: %1").arg(m_ipVersion);
return false;
}
CHECK_METADATA_REQ(u"record_size"_qs, UShort);
m_recordSize = metadata.value(u"record_size"_qs).value<quint16>();
CHECK_METADATA_REQ(u"record_size"_s, UShort);
m_recordSize = metadata.value(u"record_size"_s).value<quint16>();
if (m_recordSize != 24)
{
error = tr("Unsupported record size: %1").arg(m_recordSize);
@@ -261,18 +261,18 @@ bool GeoIPDatabase::parseMetadata(const QVariantHash &metadata, QString &error)
m_nodeSize = m_recordSize / 4;
m_recordBytes = m_nodeSize / 2;
CHECK_METADATA_REQ(u"node_count"_qs, UInt);
m_nodeCount = metadata.value(u"node_count"_qs).value<quint32>();
CHECK_METADATA_REQ(u"node_count"_s, UInt);
m_nodeCount = metadata.value(u"node_count"_s).value<quint32>();
m_indexSize = m_nodeCount * m_nodeSize;
CHECK_METADATA_REQ(u"database_type"_qs, QString);
m_dbType = metadata.value(u"database_type"_qs).toString();
CHECK_METADATA_REQ(u"database_type"_s, QString);
m_dbType = metadata.value(u"database_type"_s).toString();
CHECK_METADATA_REQ(u"build_epoch"_qs, ULongLong);
m_buildEpoch = QDateTime::fromSecsSinceEpoch(metadata.value(u"build_epoch"_qs).toULongLong());
CHECK_METADATA_REQ(u"build_epoch"_s, ULongLong);
m_buildEpoch = QDateTime::fromSecsSinceEpoch(metadata.value(u"build_epoch"_s).toULongLong());
CHECK_METADATA_OPT(u"languages"_qs, QVariantList);
CHECK_METADATA_OPT(u"description"_qs, QVariantHash);
CHECK_METADATA_OPT(u"languages"_s, QVariantList);
CHECK_METADATA_OPT(u"description"_s, QVariantHash);
return true;
}

504
src/base/net/geoipmanager.cpp
View File

@@ -43,9 +43,9 @@
#include "downloadmanager.h"
#include "geoipdatabase.h"
const QString DATABASE_URL = u"https://download.db-ip.com/free/dbip-country-lite-%1.mmdb.gz"_qs;
const QString GEODB_FOLDER = u"GeoDB"_qs;
const QString GEODB_FILENAME = u"dbip-country-lite.mmdb"_qs;
const QString DATABASE_URL = u"https://download.db-ip.com/free/dbip-country-lite-%1.mmdb.gz"_s;
const QString GEODB_FOLDER = u"GeoDB"_s;
const QString GEODB_FILENAME = u"dbip-country-lite.mmdb"_s;
using namespace Net;
@@ -150,255 +150,255 @@ QString GeoIPManager::CountryName(const QString &countryISOCode)
// http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements_txt-temp.htm
// Officially assigned
{u"AD"_qs, tr("Andorra")},
{u"AE"_qs, tr("United Arab Emirates")},
{u"AF"_qs, tr("Afghanistan")},
{u"AG"_qs, tr("Antigua and Barbuda")},
{u"AI"_qs, tr("Anguilla")},
{u"AL"_qs, tr("Albania")},
{u"AM"_qs, tr("Armenia")},
{u"AO"_qs, tr("Angola")},
{u"AQ"_qs, tr("Antarctica")},
{u"AR"_qs, tr("Argentina")},
{u"AS"_qs, tr("American Samoa")},
{u"AT"_qs, tr("Austria")},
{u"AU"_qs, tr("Australia")},
{u"AW"_qs, tr("Aruba")},
{u"AX"_qs, tr("Aland Islands")},
{u"AZ"_qs, tr("Azerbaijan")},
{u"BA"_qs, tr("Bosnia and Herzegovina")},
{u"BB"_qs, tr("Barbados")},
{u"BD"_qs, tr("Bangladesh")},
{u"BE"_qs, tr("Belgium")},
{u"BF"_qs, tr("Burkina Faso")},
{u"BG"_qs, tr("Bulgaria")},
{u"BH"_qs, tr("Bahrain")},
{u"BI"_qs, tr("Burundi")},
{u"BJ"_qs, tr("Benin")},
{u"BL"_qs, tr("Saint Barthelemy")},
{u"BM"_qs, tr("Bermuda")},
{u"BN"_qs, tr("Brunei Darussalam")},
{u"BO"_qs, tr("Bolivia, Plurinational State of")},
{u"BQ"_qs, tr("Bonaire, Sint Eustatius and Saba")},
{u"BR"_qs, tr("Brazil")},
{u"BS"_qs, tr("Bahamas")},
{u"BT"_qs, tr("Bhutan")},
{u"BV"_qs, tr("Bouvet Island")},
{u"BW"_qs, tr("Botswana")},
{u"BY"_qs, tr("Belarus")},
{u"BZ"_qs, tr("Belize")},
{u"CA"_qs, tr("Canada")},
{u"CC"_qs, tr("Cocos (Keeling) Islands")},
{u"CD"_qs, tr("Congo, The Democratic Republic of the")},
{u"CF"_qs, tr("Central African Republic")},
{u"CG"_qs, tr("Congo")},
{u"CH"_qs, tr("Switzerland")},
{u"CI"_qs, tr("Cote d'Ivoire")},
{u"CK"_qs, tr("Cook Islands")},
{u"CL"_qs, tr("Chile")},
{u"CM"_qs, tr("Cameroon")},
{u"CN"_qs, tr("China")},
{u"CO"_qs, tr("Colombia")},
{u"CR"_qs, tr("Costa Rica")},
{u"CU"_qs, tr("Cuba")},
{u"CV"_qs, tr("Cape Verde")},
{u"CW"_qs, tr("Curacao")},
{u"CX"_qs, tr("Christmas Island")},
{u"CY"_qs, tr("Cyprus")},
{u"CZ"_qs, tr("Czech Republic")},
{u"DE"_qs, tr("Germany")},
{u"DJ"_qs, tr("Djibouti")},
{u"DK"_qs, tr("Denmark")},
{u"DM"_qs, tr("Dominica")},
{u"DO"_qs, tr("Dominican Republic")},
{u"DZ"_qs, tr("Algeria")},
{u"EC"_qs, tr("Ecuador")},
{u"EE"_qs, tr("Estonia")},
{u"EG"_qs, tr("Egypt")},
{u"EH"_qs, tr("Western Sahara")},
{u"ER"_qs, tr("Eritrea")},
{u"ES"_qs, tr("Spain")},
{u"ET"_qs, tr("Ethiopia")},
{u"FI"_qs, tr("Finland")},
{u"FJ"_qs, tr("Fiji")},
{u"FK"_qs, tr("Falkland Islands (Malvinas)")},
{u"FM"_qs, tr("Micronesia, Federated States of")},
{u"FO"_qs, tr("Faroe Islands")},
{u"FR"_qs, tr("France")},
{u"GA"_qs, tr("Gabon")},
{u"GB"_qs, tr("United Kingdom")},
{u"GD"_qs, tr("Grenada")},
{u"GE"_qs, tr("Georgia")},
{u"GF"_qs, tr("French Guiana")},
{u"GG"_qs, tr("Guernsey")},
{u"GH"_qs, tr("Ghana")},
{u"GI"_qs, tr("Gibraltar")},
{u"GL"_qs, tr("Greenland")},
{u"GM"_qs, tr("Gambia")},
{u"GN"_qs, tr("Guinea")},
{u"GP"_qs, tr("Guadeloupe")},
{u"GQ"_qs, tr("Equatorial Guinea")},
{u"GR"_qs, tr("Greece")},
{u"GS"_qs, tr("South Georgia and the South Sandwich Islands")},
{u"GT"_qs, tr("Guatemala")},
{u"GU"_qs, tr("Guam")},
{u"GW"_qs, tr("Guinea-Bissau")},
{u"GY"_qs, tr("Guyana")},
{u"HK"_qs, tr("Hong Kong")},
{u"HM"_qs, tr("Heard Island and McDonald Islands")},
{u"HN"_qs, tr("Honduras")},
{u"HR"_qs, tr("Croatia")},
{u"HT"_qs, tr("Haiti")},
{u"HU"_qs, tr("Hungary")},
{u"ID"_qs, tr("Indonesia")},
{u"IE"_qs, tr("Ireland")},
{u"IL"_qs, tr("Israel")},
{u"IM"_qs, tr("Isle of Man")},
{u"IN"_qs, tr("India")},
{u"IO"_qs, tr("British Indian Ocean Territory")},
{u"IQ"_qs, tr("Iraq")},
{u"IR"_qs, tr("Iran, Islamic Republic of")},
{u"IS"_qs, tr("Iceland")},
{u"IT"_qs, tr("Italy")},
{u"JE"_qs, tr("Jersey")},
{u"JM"_qs, tr("Jamaica")},
{u"JO"_qs, tr("Jordan")},
{u"JP"_qs, tr("Japan")},
{u"KE"_qs, tr("Kenya")},
{u"KG"_qs, tr("Kyrgyzstan")},
{u"KH"_qs, tr("Cambodia")},
{u"KI"_qs, tr("Kiribati")},
{u"KM"_qs, tr("Comoros")},
{u"KN"_qs, tr("Saint Kitts and Nevis")},
{u"KP"_qs, tr("Korea, Democratic People's Republic of")},
{u"KR"_qs, tr("Korea, Republic of")},
{u"KW"_qs, tr("Kuwait")},
{u"KY"_qs, tr("Cayman Islands")},
{u"KZ"_qs, tr("Kazakhstan")},
{u"LA"_qs, tr("Lao People's Democratic Republic")},
{u"LB"_qs, tr("Lebanon")},
{u"LC"_qs, tr("Saint Lucia")},
{u"LI"_qs, tr("Liechtenstein")},
{u"LK"_qs, tr("Sri Lanka")},
{u"LR"_qs, tr("Liberia")},
{u"LS"_qs, tr("Lesotho")},
{u"LT"_qs, tr("Lithuania")},
{u"LU"_qs, tr("Luxembourg")},
{u"LV"_qs, tr("Latvia")},
{u"LY"_qs, tr("Libya")},
{u"MA"_qs, tr("Morocco")},
{u"MC"_qs, tr("Monaco")},
{u"MD"_qs, tr("Moldova, Republic of")},
{u"ME"_qs, tr("Montenegro")},
{u"MF"_qs, tr("Saint Martin (French part)")},
{u"MG"_qs, tr("Madagascar")},
{u"MH"_qs, tr("Marshall Islands")},
{u"MK"_qs, tr("Macedonia, The Former Yugoslav Republic of")},
{u"ML"_qs, tr("Mali")},
{u"MM"_qs, tr("Myanmar")},
{u"MN"_qs, tr("Mongolia")},
{u"MO"_qs, tr("Macao")},
{u"MP"_qs, tr("Northern Mariana Islands")},
{u"MQ"_qs, tr("Martinique")},
{u"MR"_qs, tr("Mauritania")},
{u"MS"_qs, tr("Montserrat")},
{u"MT"_qs, tr("Malta")},
{u"MU"_qs, tr("Mauritius")},
{u"MV"_qs, tr("Maldives")},
{u"MW"_qs, tr("Malawi")},
{u"MX"_qs, tr("Mexico")},
{u"MY"_qs, tr("Malaysia")},
{u"MZ"_qs, tr("Mozambique")},
{u"NA"_qs, tr("Namibia")},
{u"NC"_qs, tr("New Caledonia")},
{u"NE"_qs, tr("Niger")},
{u"NF"_qs, tr("Norfolk Island")},
{u"NG"_qs, tr("Nigeria")},
{u"NI"_qs, tr("Nicaragua")},
{u"NL"_qs, tr("Netherlands")},
{u"NO"_qs, tr("Norway")},
{u"NP"_qs, tr("Nepal")},
{u"NR"_qs, tr("Nauru")},
{u"NU"_qs, tr("Niue")},
{u"NZ"_qs, tr("New Zealand")},
{u"OM"_qs, tr("Oman")},
{u"PA"_qs, tr("Panama")},
{u"PE"_qs, tr("Peru")},
{u"PF"_qs, tr("French Polynesia")},
{u"PG"_qs, tr("Papua New Guinea")},
{u"PH"_qs, tr("Philippines")},
{u"PK"_qs, tr("Pakistan")},
{u"PL"_qs, tr("Poland")},
{u"PM"_qs, tr("Saint Pierre and Miquelon")},
{u"PN"_qs, tr("Pitcairn")},
{u"PR"_qs, tr("Puerto Rico")},
{u"PS"_qs, tr("Palestine, State of")},
{u"PT"_qs, tr("Portugal")},
{u"PW"_qs, tr("Palau")},
{u"PY"_qs, tr("Paraguay")},
{u"QA"_qs, tr("Qatar")},
{u"RE"_qs, tr("Reunion")},
{u"RO"_qs, tr("Romania")},
{u"RS"_qs, tr("Serbia")},
{u"RU"_qs, tr("Russian Federation")},
{u"RW"_qs, tr("Rwanda")},
{u"SA"_qs, tr("Saudi Arabia")},
{u"SB"_qs, tr("Solomon Islands")},
{u"SC"_qs, tr("Seychelles")},
{u"SD"_qs, tr("Sudan")},
{u"SE"_qs, tr("Sweden")},
{u"SG"_qs, tr("Singapore")},
{u"SH"_qs, tr("Saint Helena, Ascension and Tristan da Cunha")},
{u"SI"_qs, tr("Slovenia")},
{u"SJ"_qs, tr("Svalbard and Jan Mayen")},
{u"SK"_qs, tr("Slovakia")},
{u"SL"_qs, tr("Sierra Leone")},
{u"SM"_qs, tr("San Marino")},
{u"SN"_qs, tr("Senegal")},
{u"SO"_qs, tr("Somalia")},
{u"SR"_qs, tr("Suriname")},
{u"SS"_qs, tr("South Sudan")},
{u"ST"_qs, tr("Sao Tome and Principe")},
{u"SV"_qs, tr("El Salvador")},
{u"SX"_qs, tr("Sint Maarten (Dutch part)")},
{u"SY"_qs, tr("Syrian Arab Republic")},
{u"SZ"_qs, tr("Swaziland")},
{u"TC"_qs, tr("Turks and Caicos Islands")},
{u"TD"_qs, tr("Chad")},
{u"TF"_qs, tr("French Southern Territories")},
{u"TG"_qs, tr("Togo")},
{u"TH"_qs, tr("Thailand")},
{u"TJ"_qs, tr("Tajikistan")},
{u"TK"_qs, tr("Tokelau")},
{u"TL"_qs, tr("Timor-Leste")},
{u"TM"_qs, tr("Turkmenistan")},
{u"TN"_qs, tr("Tunisia")},
{u"TO"_qs, tr("Tonga")},
{u"TR"_qs, tr("Turkey")},
{u"TT"_qs, tr("Trinidad and Tobago")},
{u"TV"_qs, tr("Tuvalu")},
{u"TW"_qs, tr("Taiwan")},
{u"TZ"_qs, tr("Tanzania, United Republic of")},
{u"UA"_qs, tr("Ukraine")},
{u"UG"_qs, tr("Uganda")},
{u"UM"_qs, tr("United States Minor Outlying Islands")},
{u"US"_qs, tr("United States")},
{u"UY"_qs, tr("Uruguay")},
{u"UZ"_qs, tr("Uzbekistan")},
{u"VA"_qs, tr("Holy See (Vatican City State)")},
{u"VC"_qs, tr("Saint Vincent and the Grenadines")},
{u"VE"_qs, tr("Venezuela, Bolivarian Republic of")},
{u"VG"_qs, tr("Virgin Islands, British")},
{u"VI"_qs, tr("Virgin Islands, U.S.")},
{u"VN"_qs, tr("Vietnam")},
{u"VU"_qs, tr("Vanuatu")},
{u"WF"_qs, tr("Wallis and Futuna")},
{u"WS"_qs, tr("Samoa")},
{u"YE"_qs, tr("Yemen")},
{u"YT"_qs, tr("Mayotte")},
{u"ZA"_qs, tr("South Africa")},
{u"ZM"_qs, tr("Zambia")},
{u"ZW"_qs, tr("Zimbabwe")},
{u"AD"_s, tr("Andorra")},
{u"AE"_s, tr("United Arab Emirates")},
{u"AF"_s, tr("Afghanistan")},
{u"AG"_s, tr("Antigua and Barbuda")},
{u"AI"_s, tr("Anguilla")},
{u"AL"_s, tr("Albania")},
{u"AM"_s, tr("Armenia")},
{u"AO"_s, tr("Angola")},
{u"AQ"_s, tr("Antarctica")},
{u"AR"_s, tr("Argentina")},
{u"AS"_s, tr("American Samoa")},
{u"AT"_s, tr("Austria")},
{u"AU"_s, tr("Australia")},
{u"AW"_s, tr("Aruba")},
{u"AX"_s, tr("Aland Islands")},
{u"AZ"_s, tr("Azerbaijan")},
{u"BA"_s, tr("Bosnia and Herzegovina")},
{u"BB"_s, tr("Barbados")},
{u"BD"_s, tr("Bangladesh")},
{u"BE"_s, tr("Belgium")},
{u"BF"_s, tr("Burkina Faso")},
{u"BG"_s, tr("Bulgaria")},
{u"BH"_s, tr("Bahrain")},
{u"BI"_s, tr("Burundi")},
{u"BJ"_s, tr("Benin")},
{u"BL"_s, tr("Saint Barthelemy")},
{u"BM"_s, tr("Bermuda")},
{u"BN"_s, tr("Brunei Darussalam")},
{u"BO"_s, tr("Bolivia, Plurinational State of")},
{u"BQ"_s, tr("Bonaire, Sint Eustatius and Saba")},
{u"BR"_s, tr("Brazil")},
{u"BS"_s, tr("Bahamas")},
{u"BT"_s, tr("Bhutan")},
{u"BV"_s, tr("Bouvet Island")},
{u"BW"_s, tr("Botswana")},
{u"BY"_s, tr("Belarus")},
{u"BZ"_s, tr("Belize")},
{u"CA"_s, tr("Canada")},
{u"CC"_s, tr("Cocos (Keeling) Islands")},
{u"CD"_s, tr("Congo, The Democratic Republic of the")},
{u"CF"_s, tr("Central African Republic")},
{u"CG"_s, tr("Congo")},
{u"CH"_s, tr("Switzerland")},
{u"CI"_s, tr("Cote d'Ivoire")},
{u"CK"_s, tr("Cook Islands")},
{u"CL"_s, tr("Chile")},
{u"CM"_s, tr("Cameroon")},
{u"CN"_s, tr("China")},
{u"CO"_s, tr("Colombia")},
{u"CR"_s, tr("Costa Rica")},
{u"CU"_s, tr("Cuba")},
{u"CV"_s, tr("Cape Verde")},
{u"CW"_s, tr("Curacao")},
{u"CX"_s, tr("Christmas Island")},
{u"CY"_s, tr("Cyprus")},
{u"CZ"_s, tr("Czech Republic")},
{u"DE"_s, tr("Germany")},
{u"DJ"_s, tr("Djibouti")},
{u"DK"_s, tr("Denmark")},
{u"DM"_s, tr("Dominica")},
{u"DO"_s, tr("Dominican Republic")},
{u"DZ"_s, tr("Algeria")},
{u"EC"_s, tr("Ecuador")},
{u"EE"_s, tr("Estonia")},
{u"EG"_s, tr("Egypt")},
{u"EH"_s, tr("Western Sahara")},
{u"ER"_s, tr("Eritrea")},
{u"ES"_s, tr("Spain")},
{u"ET"_s, tr("Ethiopia")},
{u"FI"_s, tr("Finland")},
{u"FJ"_s, tr("Fiji")},
{u"FK"_s, tr("Falkland Islands (Malvinas)")},
{u"FM"_s, tr("Micronesia, Federated States of")},
{u"FO"_s, tr("Faroe Islands")},
{u"FR"_s, tr("France")},
{u"GA"_s, tr("Gabon")},
{u"GB"_s, tr("United Kingdom")},
{u"GD"_s, tr("Grenada")},
{u"GE"_s, tr("Georgia")},
{u"GF"_s, tr("French Guiana")},
{u"GG"_s, tr("Guernsey")},
{u"GH"_s, tr("Ghana")},
{u"GI"_s, tr("Gibraltar")},
{u"GL"_s, tr("Greenland")},
{u"GM"_s, tr("Gambia")},
{u"GN"_s, tr("Guinea")},
{u"GP"_s, tr("Guadeloupe")},
{u"GQ"_s, tr("Equatorial Guinea")},
{u"GR"_s, tr("Greece")},
{u"GS"_s, tr("South Georgia and the South Sandwich Islands")},
{u"GT"_s, tr("Guatemala")},
{u"GU"_s, tr("Guam")},
{u"GW"_s, tr("Guinea-Bissau")},
{u"GY"_s, tr("Guyana")},
{u"HK"_s, tr("Hong Kong")},
{u"HM"_s, tr("Heard Island and McDonald Islands")},
{u"HN"_s, tr("Honduras")},
{u"HR"_s, tr("Croatia")},
{u"HT"_s, tr("Haiti")},
{u"HU"_s, tr("Hungary")},
{u"ID"_s, tr("Indonesia")},
{u"IE"_s, tr("Ireland")},
{u"IL"_s, tr("Israel")},
{u"IM"_s, tr("Isle of Man")},
{u"IN"_s, tr("India")},
{u"IO"_s, tr("British Indian Ocean Territory")},
{u"IQ"_s, tr("Iraq")},
{u"IR"_s, tr("Iran, Islamic Republic of")},
{u"IS"_s, tr("Iceland")},
{u"IT"_s, tr("Italy")},
{u"JE"_s, tr("Jersey")},
{u"JM"_s, tr("Jamaica")},
{u"JO"_s, tr("Jordan")},
{u"JP"_s, tr("Japan")},
{u"KE"_s, tr("Kenya")},
{u"KG"_s, tr("Kyrgyzstan")},
{u"KH"_s, tr("Cambodia")},
{u"KI"_s, tr("Kiribati")},
{u"KM"_s, tr("Comoros")},
{u"KN"_s, tr("Saint Kitts and Nevis")},
{u"KP"_s, tr("Korea, Democratic People's Republic of")},
{u"KR"_s, tr("Korea, Republic of")},
{u"KW"_s, tr("Kuwait")},
{u"KY"_s, tr("Cayman Islands")},
{u"KZ"_s, tr("Kazakhstan")},
{u"LA"_s, tr("Lao People's Democratic Republic")},
{u"LB"_s, tr("Lebanon")},
{u"LC"_s, tr("Saint Lucia")},
{u"LI"_s, tr("Liechtenstein")},
{u"LK"_s, tr("Sri Lanka")},
{u"LR"_s, tr("Liberia")},
{u"LS"_s, tr("Lesotho")},
{u"LT"_s, tr("Lithuania")},
{u"LU"_s, tr("Luxembourg")},
{u"LV"_s, tr("Latvia")},
{u"LY"_s, tr("Libya")},
{u"MA"_s, tr("Morocco")},
{u"MC"_s, tr("Monaco")},
{u"MD"_s, tr("Moldova, Republic of")},
{u"ME"_s, tr("Montenegro")},
{u"MF"_s, tr("Saint Martin (French part)")},
{u"MG"_s, tr("Madagascar")},
{u"MH"_s, tr("Marshall Islands")},
{u"MK"_s, tr("Macedonia, The Former Yugoslav Republic of")},
{u"ML"_s, tr("Mali")},
{u"MM"_s, tr("Myanmar")},
{u"MN"_s, tr("Mongolia")},
{u"MO"_s, tr("Macao")},
{u"MP"_s, tr("Northern Mariana Islands")},
{u"MQ"_s, tr("Martinique")},
{u"MR"_s, tr("Mauritania")},
{u"MS"_s, tr("Montserrat")},
{u"MT"_s, tr("Malta")},
{u"MU"_s, tr("Mauritius")},
{u"MV"_s, tr("Maldives")},
{u"MW"_s, tr("Malawi")},
{u"MX"_s, tr("Mexico")},
{u"MY"_s, tr("Malaysia")},
{u"MZ"_s, tr("Mozambique")},
{u"NA"_s, tr("Namibia")},
{u"NC"_s, tr("New Caledonia")},
{u"NE"_s, tr("Niger")},
{u"NF"_s, tr("Norfolk Island")},
{u"NG"_s, tr("Nigeria")},
{u"NI"_s, tr("Nicaragua")},
{u"NL"_s, tr("Netherlands")},
{u"NO"_s, tr("Norway")},
{u"NP"_s, tr("Nepal")},
{u"NR"_s, tr("Nauru")},
{u"NU"_s, tr("Niue")},
{u"NZ"_s, tr("New Zealand")},
{u"OM"_s, tr("Oman")},
{u"PA"_s, tr("Panama")},
{u"PE"_s, tr("Peru")},
{u"PF"_s, tr("French Polynesia")},
{u"PG"_s, tr("Papua New Guinea")},
{u"PH"_s, tr("Philippines")},
{u"PK"_s, tr("Pakistan")},
{u"PL"_s, tr("Poland")},
{u"PM"_s, tr("Saint Pierre and Miquelon")},
{u"PN"_s, tr("Pitcairn")},
{u"PR"_s, tr("Puerto Rico")},
{u"PS"_s, tr("Palestine, State of")},
{u"PT"_s, tr("Portugal")},
{u"PW"_s, tr("Palau")},
{u"PY"_s, tr("Paraguay")},
{u"QA"_s, tr("Qatar")},
{u"RE"_s, tr("Reunion")},
{u"RO"_s, tr("Romania")},
{u"RS"_s, tr("Serbia")},
{u"RU"_s, tr("Russian Federation")},
{u"RW"_s, tr("Rwanda")},
{u"SA"_s, tr("Saudi Arabia")},
{u"SB"_s, tr("Solomon Islands")},
{u"SC"_s, tr("Seychelles")},
{u"SD"_s, tr("Sudan")},
{u"SE"_s, tr("Sweden")},
{u"SG"_s, tr("Singapore")},
{u"SH"_s, tr("Saint Helena, Ascension and Tristan da Cunha")},
{u"SI"_s, tr("Slovenia")},
{u"SJ"_s, tr("Svalbard and Jan Mayen")},
{u"SK"_s, tr("Slovakia")},
{u"SL"_s, tr("Sierra Leone")},
{u"SM"_s, tr("San Marino")},
{u"SN"_s, tr("Senegal")},
{u"SO"_s, tr("Somalia")},
{u"SR"_s, tr("Suriname")},
{u"SS"_s, tr("South Sudan")},
{u"ST"_s, tr("Sao Tome and Principe")},
{u"SV"_s, tr("El Salvador")},
{u"SX"_s, tr("Sint Maarten (Dutch part)")},
{u"SY"_s, tr("Syrian Arab Republic")},
{u"SZ"_s, tr("Swaziland")},
{u"TC"_s, tr("Turks and Caicos Islands")},
{u"TD"_s, tr("Chad")},
{u"TF"_s, tr("French Southern Territories")},
{u"TG"_s, tr("Togo")},
{u"TH"_s, tr("Thailand")},
{u"TJ"_s, tr("Tajikistan")},
{u"TK"_s, tr("Tokelau")},
{u"TL"_s, tr("Timor-Leste")},
{u"TM"_s, tr("Turkmenistan")},
{u"TN"_s, tr("Tunisia")},
{u"TO"_s, tr("Tonga")},
{u"TR"_s, tr("Turkey")},
{u"TT"_s, tr("Trinidad and Tobago")},
{u"TV"_s, tr("Tuvalu")},
{u"TW"_s, tr("Taiwan")},
{u"TZ"_s, tr("Tanzania, United Republic of")},
{u"UA"_s, tr("Ukraine")},
{u"UG"_s, tr("Uganda")},
{u"UM"_s, tr("United States Minor Outlying Islands")},
{u"US"_s, tr("United States")},
{u"UY"_s, tr("Uruguay")},
{u"UZ"_s, tr("Uzbekistan")},
{u"VA"_s, tr("Holy See (Vatican City State)")},
{u"VC"_s, tr("Saint Vincent and the Grenadines")},
{u"VE"_s, tr("Venezuela, Bolivarian Republic of")},
{u"VG"_s, tr("Virgin Islands, British")},
{u"VI"_s, tr("Virgin Islands, U.S.")},
{u"VN"_s, tr("Vietnam")},
{u"VU"_s, tr("Vanuatu")},
{u"WF"_s, tr("Wallis and Futuna")},
{u"WS"_s, tr("Samoa")},
{u"YE"_s, tr("Yemen")},
{u"YT"_s, tr("Mayotte")},
{u"ZA"_s, tr("South Africa")},
{u"ZM"_s, tr("Zambia")},
{u"ZW"_s, tr("Zimbabwe")},
{{}, tr("N/A")}
};

16
src/base/net/proxyconfigurationmanager.cpp
View File

@@ -52,18 +52,18 @@ ProxyConfigurationManager *ProxyConfigurationManager::m_instance = nullptr;
ProxyConfigurationManager::ProxyConfigurationManager(QObject *parent)
: QObject(parent)
, m_storeProxyType {SETTINGS_KEY(u"Type"_qs)}
, m_storeProxyIP {SETTINGS_KEY(u"IP"_qs)}
, m_storeProxyPort {SETTINGS_KEY(u"Port"_qs)}
, m_storeProxyAuthEnabled {SETTINGS_KEY(u"AuthEnabled"_qs)}
, m_storeProxyUsername {SETTINGS_KEY(u"Username"_qs)}
, m_storeProxyPassword {SETTINGS_KEY(u"Password"_qs)}
, m_storeProxyHostnameLookupEnabled {SETTINGS_KEY(u"HostnameLookupEnabled"_qs)}
, m_storeProxyType {SETTINGS_KEY(u"Type"_s)}
, m_storeProxyIP {SETTINGS_KEY(u"IP"_s)}
, m_storeProxyPort {SETTINGS_KEY(u"Port"_s)}
, m_storeProxyAuthEnabled {SETTINGS_KEY(u"AuthEnabled"_s)}
, m_storeProxyUsername {SETTINGS_KEY(u"Username"_s)}
, m_storeProxyPassword {SETTINGS_KEY(u"Password"_s)}
, m_storeProxyHostnameLookupEnabled {SETTINGS_KEY(u"HostnameLookupEnabled"_s)}
{
m_config.type = m_storeProxyType.get(ProxyType::HTTP);
if ((m_config.type < ProxyType::HTTP) || (m_config.type > ProxyType::SOCKS4))
m_config.type = ProxyType::HTTP;
m_config.ip = m_storeProxyIP.get(u"0.0.0.0"_qs);
m_config.ip = m_storeProxyIP.get(u"0.0.0.0"_s);
m_config.port = m_storeProxyPort.get(8080);
m_config.authEnabled = m_storeProxyAuthEnabled;
m_config.username = m_storeProxyUsername;

2
src/base/net/proxyconfigurationmanager.h
View File

@@ -48,7 +48,7 @@ namespace Net
struct ProxyConfiguration
{
ProxyType type = ProxyType::HTTP;
QString ip = u"0.0.0.0"_qs;
QString ip = u"0.0.0.0"_s;
ushort port = 8080;
bool authEnabled = false;
QString username;

16
src/base/net/smtp.cpp
View File

@@ -85,7 +85,7 @@ namespace
{
QString hostname = QHostInfo::localHostName();
if (hostname.isEmpty())
hostname = u"localhost"_qs;
hostname = u"localhost"_s;
return hostname.toLocal8Bit();
}
@@ -138,16 +138,16 @@ void Smtp::sendMail(const QString &from, const QString &to, const QString &subje
{
const Preferences *const pref = Preferences::instance();
m_message = "Date: " + getCurrentDateTime().toLatin1() + "\r\n"
+ encodeMimeHeader(u"From"_qs, u"qBittorrent <%1>"_qs.arg(from))
+ encodeMimeHeader(u"Subject"_qs, subject)
+ encodeMimeHeader(u"To"_qs, to)
+ encodeMimeHeader(u"From"_s, u"qBittorrent <%1>"_s.arg(from))
+ encodeMimeHeader(u"Subject"_s, subject)
+ encodeMimeHeader(u"To"_s, to)
+ "MIME-Version: 1.0\r\n"
+ "Content-Type: text/plain; charset=UTF-8\r\n"
+ "Content-Transfer-Encoding: base64\r\n"
+ "\r\n";
// Encode the body in base64
QString crlfBody = body;
const QByteArray b = crlfBody.replace(u"\n"_qs, u"\r\n"_qs).toUtf8().toBase64();
const QByteArray b = crlfBody.replace(u"\n"_s, u"\r\n"_s).toUtf8().toBase64();
const int ct = b.length();
for (int i = 0; i < ct; i += 78)
m_message += b.mid(i, 78);
@@ -424,7 +424,7 @@ void Smtp::parseEhloResponse(const QByteArray &code, const bool continued, const
if (m_state != EhloDone) return;
if (m_extensions.contains(u"STARTTLS"_qs) && m_useSsl)
if (m_extensions.contains(u"STARTTLS"_s) && m_useSsl)
{
qDebug() << "STARTTLS";
startTLS();
@@ -438,7 +438,7 @@ void Smtp::parseEhloResponse(const QByteArray &code, const bool continued, const
void Smtp::authenticate()
{
qDebug() << Q_FUNC_INFO;
if (!m_extensions.contains(u"AUTH"_qs) ||
if (!m_extensions.contains(u"AUTH"_s) ||
m_username.isEmpty() || m_password.isEmpty())
{
// Skip authentication
@@ -453,7 +453,7 @@ void Smtp::authenticate()
// AUTH extension is supported, check which
// authentication modes are supported by
// the server
const QStringList auth = m_extensions[u"AUTH"_qs].toUpper().split(u' ', Qt::SkipEmptyParts);
const QStringList auth = m_extensions[u"AUTH"_s].toUpper().split(u' ', Qt::SkipEmptyParts);
if (auth.contains(u"CRAM-MD5"))
{
qDebug() << "Using CRAM-MD5 authentication...";