github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-11 15:56:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use QString literals

Browse source 
It covers src/webui and enables `QT_NO_CAST_FROM_ASCII`.
This commit is contained in:
Chocobo1 2022-03-19 15:57:41 +08:00
parent f888fb4ac7
commit efc04645b7
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
25 changed files with 836 additions and 824 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/base/utils/foreignapps.cpp
View file

@ -186,7 +186,7 @@ namespace
bool found = false;
while (!found && !versions.empty())
{
const QString version = versions.takeLast() + "\\InstallPath";
const QString version = versions.takeLast() + u"\\InstallPath";
LPWSTR lpSubkey = new WCHAR[version.size() + 1];
version.toWCharArray(lpSubkey);
lpSubkey[version.size()] = 0;
@ -205,15 +205,15 @@ namespace
{
const QDir baseDir {path};
if (baseDir.exists("python3.exe"))
if (baseDir.exists(u"python3.exe"_qs))
{
found = true;
path = baseDir.filePath("python3.exe");
path = baseDir.filePath(u"python3.exe"_qs);
}
else if (baseDir.exists("python.exe"))
else if (baseDir.exists(u"python.exe"_qs))
{
found = true;
path = baseDir.filePath("python.exe");
path = baseDir.filePath(u"python.exe"_qs);
}
}
}
@ -243,14 +243,14 @@ namespace
return path;
// Fallback: Detect python from default locations
const QFileInfoList dirs = QDir("C:/").entryInfoList({"Python*"}, QDir::Dirs, (QDir::Name | QDir::Reversed));
const QFileInfoList dirs = QDir(u"C:/"_qs).entryInfoList({u"Python*"_qs}, QDir::Dirs, (QDir::Name | QDir::Reversed));
for (const QFileInfo &info : dirs)
{
const QString py3Path {info.absolutePath() + "/python3.exe"};
const QString py3Path {info.absolutePath() + u"/python3.exe"};
if (QFile::exists(py3Path))
return py3Path;
const QString pyPath {info.absolutePath() + "/python.exe"};
const QString pyPath {info.absolutePath() + u"/python.exe"};
if (QFile::exists(pyPath))
return pyPath;
}