squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-31 20:58:07 -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

18
src/base/utils/foreignapps.cpp
View File

@@ -53,7 +53,7 @@ namespace
bool testPythonInstallation(const QString &exeName, PythonInfo &info)
{
QProcess proc;
proc.start(exeName, {u"--version"_qs}, QIODevice::ReadOnly);
proc.start(exeName, {u"--version"_s}, QIODevice::ReadOnly);
if (proc.waitForFinished() && (proc.exitCode() == QProcess::NormalExit))
{
QByteArray procOutput = proc.readAllStandardOutput();
@@ -71,7 +71,7 @@ namespace
// User reports: `python --version` -> "Python 3.6.6+"
// So trim off unrelated characters
const auto versionStr = QString::fromLocal8Bit(outputSplit[1]);
const int idx = versionStr.indexOf(QRegularExpression(u"[^\\.\\d]"_qs));
const int idx = versionStr.indexOf(QRegularExpression(u"[^\\.\\d]"_s));
const auto version = PythonInfo::Version::fromString(versionStr.left(idx));
if (!version.isValid())
return false;
@@ -186,15 +186,15 @@ namespace
{
const QDir baseDir {path};
if (baseDir.exists(u"python3.exe"_qs))
if (baseDir.exists(u"python3.exe"_s))
{
found = true;
path = baseDir.filePath(u"python3.exe"_qs);
path = baseDir.filePath(u"python3.exe"_s);
}
else if (baseDir.exists(u"python.exe"_qs))
else if (baseDir.exists(u"python.exe"_s))
{
found = true;
path = baseDir.filePath(u"python.exe"_qs);
path = baseDir.filePath(u"python.exe"_s);
}
}
}
@@ -224,7 +224,7 @@ namespace
return path;
// Fallback: Detect python from default locations
const QFileInfoList dirs = QDir(u"C:/"_qs).entryInfoList({u"Python*"_qs}, QDir::Dirs, (QDir::Name | QDir::Reversed));
const QFileInfoList dirs = QDir(u"C:/"_s).entryInfoList({u"Python*"_s}, QDir::Dirs, (QDir::Name | QDir::Reversed));
for (const QFileInfo &info : dirs)
{
const QString py3Path {info.absolutePath() + u"/python3.exe"};
@@ -256,10 +256,10 @@ PythonInfo Utils::ForeignApps::pythonInfo()
static PythonInfo pyInfo;
if (!pyInfo.isValid())
{
if (testPythonInstallation(u"python3"_qs, pyInfo))
if (testPythonInstallation(u"python3"_s, pyInfo))
return pyInfo;
if (testPythonInstallation(u"python"_qs, pyInfo))
if (testPythonInstallation(u"python"_s, pyInfo))
return pyInfo;
#if defined(Q_OS_WIN)

2
src/base/utils/foreignapps.h
View File

@@ -36,7 +36,7 @@
namespace Utils::ForeignApps
{
inline const QString PYTHON_ISOLATE_MODE_FLAG = u"-I"_qs;
inline const QString PYTHON_ISOLATE_MODE_FLAG = u"-I"_s;
struct PythonInfo
{

14
src/base/utils/fs.cpp
View File

@@ -81,12 +81,12 @@ bool Utils::Fs::smartRemoveEmptyFolderTree(const Path &path)
const QStringList deleteFilesList =
{
// Windows
u"Thumbs.db"_qs,
u"desktop.ini"_qs,
u"Thumbs.db"_s,
u"desktop.ini"_s,
// Linux
u".directory"_qs,
u".directory"_s,
// Mac OS
u".DS_Store"_qs
u".DS_Store"_s
};
// travel from the deepest folder and remove anything unwanted on the way out.
@@ -191,7 +191,7 @@ bool Utils::Fs::sameFiles(const Path &path1, const Path &path2)
QString Utils::Fs::toValidFileName(const QString &name, const QString &pad)
{
const QRegularExpression regex {u"[\\\\/:?\"*<>|]+"_qs};
const QRegularExpression regex {u"[\\\\/:?\"*<>|]+"_s};
QString validName = name.trimmed();
validName.replace(regex, pad);
@@ -201,7 +201,7 @@ QString Utils::Fs::toValidFileName(const QString &name, const QString &pad)
Path Utils::Fs::toValidPath(const QString &name, const QString &pad)
{
const QRegularExpression regex {u"[:?\"*<>|]+"_qs};
const QRegularExpression regex {u"[:?\"*<>|]+"_s};
QString validPathStr = name;
validPathStr.replace(regex, pad);
@@ -216,7 +216,7 @@ qint64 Utils::Fs::freeDiskSpaceOnPath(const Path &path)
Path Utils::Fs::tempPath()
{
static const Path path = Path(QDir::tempPath()) / Path(u".qBittorrent"_qs);
static const Path path = Path(QDir::tempPath()) / Path(u".qBittorrent"_s);
mkdir(path);
return path;
}

4
src/base/utils/fs.h
View File

@@ -53,8 +53,8 @@ namespace Utils::Fs
QDateTime lastModified(const Path &path);
bool sameFiles(const Path &path1, const Path &path2);
QString toValidFileName(const QString &name, const QString &pad = u" "_qs);
Path toValidPath(const QString &name, const QString &pad = u" "_qs);
QString toValidFileName(const QString &name, const QString &pad = u" "_s);
Path toValidPath(const QString &name, const QString &pad = u" "_s);
Path toCanonicalPath(const Path &path);
bool copyFile(const Path &from, const Path &to);

142
src/base/utils/misc.cpp
View File

@@ -193,59 +193,59 @@ void Utils::Misc::shutdownComputer(const ShutdownDialogAction &action)
if (action != ShutdownDialogAction::Shutdown)
{
// Some recent systems use systemd's logind
QDBusInterface login1Iface(u"org.freedesktop.login1"_qs, u"/org/freedesktop/login1"_qs,
u"org.freedesktop.login1.Manager"_qs, QDBusConnection::systemBus());
QDBusInterface login1Iface(u"org.freedesktop.login1"_s, u"/org/freedesktop/login1"_s,
u"org.freedesktop.login1.Manager"_s, QDBusConnection::systemBus());
if (login1Iface.isValid())
{
if (action == ShutdownDialogAction::Suspend)
login1Iface.call(u"Suspend"_qs, false);
login1Iface.call(u"Suspend"_s, false);
else
login1Iface.call(u"Hibernate"_qs, false);
login1Iface.call(u"Hibernate"_s, false);
return;
}
// Else, other recent systems use UPower
QDBusInterface upowerIface(u"org.freedesktop.UPower"_qs, u"/org/freedesktop/UPower"_qs,
u"org.freedesktop.UPower"_qs, QDBusConnection::systemBus());
QDBusInterface upowerIface(u"org.freedesktop.UPower"_s, u"/org/freedesktop/UPower"_s,
u"org.freedesktop.UPower"_s, QDBusConnection::systemBus());
if (upowerIface.isValid())
{
if (action == ShutdownDialogAction::Suspend)
upowerIface.call(u"Suspend"_qs);
upowerIface.call(u"Suspend"_s);
else
upowerIface.call(u"Hibernate"_qs);
upowerIface.call(u"Hibernate"_s);
return;
}
// HAL (older systems)
QDBusInterface halIface(u"org.freedesktop.Hal"_qs, u"/org/freedesktop/Hal/devices/computer"_qs,
u"org.freedesktop.Hal.Device.SystemPowerManagement"_qs,
QDBusInterface halIface(u"org.freedesktop.Hal"_s, u"/org/freedesktop/Hal/devices/computer"_s,
u"org.freedesktop.Hal.Device.SystemPowerManagement"_s,
QDBusConnection::systemBus());
if (action == ShutdownDialogAction::Suspend)
halIface.call(u"Suspend"_qs, 5);
halIface.call(u"Suspend"_s, 5);
else
halIface.call(u"Hibernate"_qs);
halIface.call(u"Hibernate"_s);
}
else
{
// Some recent systems use systemd's logind
QDBusInterface login1Iface(u"org.freedesktop.login1"_qs, u"/org/freedesktop/login1"_qs,
u"org.freedesktop.login1.Manager"_qs, QDBusConnection::systemBus());
QDBusInterface login1Iface(u"org.freedesktop.login1"_s, u"/org/freedesktop/login1"_s,
u"org.freedesktop.login1.Manager"_s, QDBusConnection::systemBus());
if (login1Iface.isValid())
{
login1Iface.call(u"PowerOff"_qs, false);
login1Iface.call(u"PowerOff"_s, false);
return;
}
// Else, other recent systems use ConsoleKit
QDBusInterface consolekitIface(u"org.freedesktop.ConsoleKit"_qs, u"/org/freedesktop/ConsoleKit/Manager"_qs,
u"org.freedesktop.ConsoleKit.Manager"_qs, QDBusConnection::systemBus());
QDBusInterface consolekitIface(u"org.freedesktop.ConsoleKit"_s, u"/org/freedesktop/ConsoleKit/Manager"_s,
u"org.freedesktop.ConsoleKit.Manager"_s, QDBusConnection::systemBus());
if (consolekitIface.isValid())
{
consolekitIface.call(u"Stop"_qs);
consolekitIface.call(u"Stop"_s);
return;
}
// HAL (older systems)
QDBusInterface halIface(u"org.freedesktop.Hal"_qs, u"/org/freedesktop/Hal/devices/computer"_qs,
u"org.freedesktop.Hal.Device.SystemPowerManagement"_qs,
QDBusInterface halIface(u"org.freedesktop.Hal"_s, u"/org/freedesktop/Hal/devices/computer"_s,
u"org.freedesktop.Hal.Device.SystemPowerManagement"_s,
QDBusConnection::systemBus());
halIface.call(u"Shutdown"_qs);
halIface.call(u"Shutdown"_s);
}
#else
@@ -308,48 +308,48 @@ bool Utils::Misc::isPreviewable(const Path &filePath)
const QSet<QString> multimediaExtensions =
{
u".3GP"_qs,
u".AAC"_qs,
u".AC3"_qs,
u".AIF"_qs,
u".AIFC"_qs,
u".AIFF"_qs,
u".ASF"_qs,
u".AU"_qs,
u".AVI"_qs,
u".FLAC"_qs,
u".FLV"_qs,
u".M3U"_qs,
u".M4A"_qs,
u".M4P"_qs,
u".M4V"_qs,
u".MID"_qs,
u".MKV"_qs,
u".MOV"_qs,
u".MP2"_qs,
u".MP3"_qs,
u".MP4"_qs,
u".MPC"_qs,
u".MPE"_qs,
u".MPEG"_qs,
u".MPG"_qs,
u".MPP"_qs,
u".OGG"_qs,
u".OGM"_qs,
u".OGV"_qs,
u".QT"_qs,
u".RA"_qs,
u".RAM"_qs,
u".RM"_qs,
u".RMV"_qs,
u".RMVB"_qs,
u".SWA"_qs,
u".SWF"_qs,
u".TS"_qs,
u".VOB"_qs,
u".WAV"_qs,
u".WMA"_qs,
u".WMV"_qs
u".3GP"_s,
u".AAC"_s,
u".AC3"_s,
u".AIF"_s,
u".AIFC"_s,
u".AIFF"_s,
u".ASF"_s,
u".AU"_s,
u".AVI"_s,
u".FLAC"_s,
u".FLV"_s,
u".M3U"_s,
u".M4A"_s,
u".M4P"_s,
u".M4V"_s,
u".MID"_s,
u".MKV"_s,
u".MOV"_s,
u".MP2"_s,
u".MP3"_s,
u".MP4"_s,
u".MPC"_s,
u".MPE"_s,
u".MPEG"_s,
u".MPG"_s,
u".MPP"_s,
u".OGG"_s,
u".OGM"_s,
u".OGV"_s,
u".QT"_s,
u".RA"_s,
u".RAM"_s,
u".RM"_s,
u".RMV"_s,
u".RMVB"_s,
u".SWA"_s,
u".SWF"_s,
u".TS"_s,
u".VOB"_s,
u".WAV"_s,
u".WMA"_s,
u".WMV"_s
};
return multimediaExtensions.contains(filePath.extension().toUpper());
}
@@ -362,7 +362,7 @@ QString Utils::Misc::userFriendlyDuration(const qlonglong seconds, const qlonglo
return C_INFINITY;
if (seconds == 0)
return u"0"_qs;
return u"0"_s;
if (seconds < 60)
return QCoreApplication::translate("misc", "< 1m", "< 1 minute");
@@ -392,7 +392,7 @@ QString Utils::Misc::userFriendlyDuration(const qlonglong seconds, const qlonglo
QString Utils::Misc::getUserIDString()
{
QString uid = u"0"_qs;
QString uid = u"0"_s;
#ifdef Q_OS_WIN
const int UNLEN = 256;
WCHAR buffer[UNLEN + 1] = {0};
@@ -540,15 +540,15 @@ QString Utils::Misc::parseHtmlLinks(const QString &rawText)
u"[a-zA-Z]{2,}" // one ab (2 char or longer) --> us
u"([a-zA-Z0-9\\?%=&/_\\.:#;-]*)" // everything to 1st non-URI char, maybe nothing in case of del.icio.us/path
u")"
u")"_qs
u")"_s
);
// Capture links
result.replace(reURL, u"\\1<a href=\"\\2\">\\2</a>"_qs);
result.replace(reURL, u"\\1<a href=\"\\2\">\\2</a>"_s);
// Capture links without scheme
const QRegularExpression reNoScheme(u"<a\\s+href=\"(?!https?)([a-zA-Z0-9\\?%=&/_\\.-:#]+)\\s*\">"_qs);
result.replace(reNoScheme, u"<a href=\"http://\\1\">"_qs);
const QRegularExpression reNoScheme(u"<a\\s+href=\"(?!https?)([a-zA-Z0-9\\?%=&/_\\.-:#]+)\\s*\">"_s);
result.replace(reNoScheme, u"<a href=\"http://\\1\">"_s);
// to preserve plain text formatting
result = u"<p style=\"white-space: pre-wrap;\">" + result + u"</p>";
@@ -559,7 +559,7 @@ QString Utils::Misc::osName()
{
// static initialization for usage in signal handler
static const QString name =
u"%1 %2 %3"_qs
u"%1 %2 %3"_s
.arg(QSysInfo::prettyProductName()
, QSysInfo::kernelVersion()
, QSysInfo::currentCpuArchitecture());
@@ -569,7 +569,7 @@ QString Utils::Misc::osName()
QString Utils::Misc::boostVersionString()
{
// static initialization for usage in signal handler
static const QString ver = u"%1.%2.%3"_qs
static const QString ver = u"%1.%2.%3"_s
.arg(QString::number(BOOST_VERSION / 100000)
, QString::number((BOOST_VERSION / 100) % 1000)
, QString::number(BOOST_VERSION % 100));

2
src/base/utils/net.cpp
View File

@@ -60,7 +60,7 @@ namespace Utils
{
return (addr == QHostAddress::LocalHost)
|| (addr == QHostAddress::LocalHostIPv6)
|| (addr == QHostAddress(u"::ffff:127.0.0.1"_qs));
|| (addr == QHostAddress(u"::ffff:127.0.0.1"_s));
}
bool isIPInSubnets(const QHostAddress &addr, const QVector<Subnet> &subnets)

2
src/base/utils/random.cpp
View File

@@ -56,7 +56,7 @@ namespace
using result_type = uint32_t;
RandomLayer()
: m_rtlGenRandom {Utils::Misc::loadWinAPI<PRTLGENRANDOM>(u"Advapi32.dll"_qs, "SystemFunction036")}
: m_rtlGenRandom {Utils::Misc::loadWinAPI<PRTLGENRANDOM>(u"Advapi32.dll"_s, "SystemFunction036")}
{
if (!m_rtlGenRandom)
qFatal("Failed to load RtlGenRandom()");

2
src/base/utils/string.h
View File

@@ -44,7 +44,7 @@ namespace Utils::String
QString wildcardToRegexPattern(const QString &pattern);
template <typename T>
T unquote(const T &str, const QString &quotes = u"\""_qs)
T unquote(const T &str, const QString &quotes = u"\""_s)
{
if (str.length() < 2) return str;