aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/utils')
-rw-r--r--src/libs/utils/commandline.cpp6
-rw-r--r--src/libs/utils/devicefileaccess.cpp2
-rw-r--r--src/libs/utils/environment.cpp2
-rw-r--r--src/libs/utils/externalterminalprocessimpl.cpp6
-rw-r--r--src/libs/utils/filecrumblabel.cpp2
-rw-r--r--src/libs/utils/fileinprojectfinder.cpp18
-rw-r--r--src/libs/utils/filepath.cpp41
-rw-r--r--src/libs/utils/filepath.h3
-rw-r--r--src/libs/utils/filesearch.cpp2
-rw-r--r--src/libs/utils/filesystemwatcher.cpp2
-rw-r--r--src/libs/utils/fileutils.cpp4
-rw-r--r--src/libs/utils/filewizardpage.cpp2
-rw-r--r--src/libs/utils/fsengine/fixedlistfsengine.h4
-rw-r--r--src/libs/utils/fsengine/fsenginehandler.cpp2
-rw-r--r--src/libs/utils/icon.cpp8
-rw-r--r--src/libs/utils/macroexpander.cpp2
-rw-r--r--src/libs/utils/outputformatter.cpp4
-rw-r--r--src/libs/utils/pathchooser.cpp6
-rw-r--r--src/libs/utils/pathchooser.h2
-rw-r--r--src/libs/utils/theme/theme.cpp2
20 files changed, 61 insertions, 59 deletions
diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp
index e7672658c36..45576733626 100644
--- a/src/libs/utils/commandline.cpp
+++ b/src/libs/utils/commandline.cpp
@@ -580,7 +580,7 @@ ProcessArgs ProcessArgs::prepareArgs(const QString &args, SplitError *err, OsTyp
QString wdcopy;
QString *wd = nullptr;
if (pwd) {
- wdcopy = pwd->toString();
+ wdcopy = pwd->toUrlishString();
wd = &wdcopy;
}
ProcessArgs res;
@@ -651,7 +651,7 @@ bool ProcessArgs::prepareCommand(const CommandLine &cmdLine, QString *outCmd, Pr
ProcessArgs::SplitError err;
*outArgs = ProcessArgs::prepareArgs(arguments, &err, executable.osType(), env, pwd);
if (err == ProcessArgs::SplitOk) {
- *outCmd = executable.toString();
+ *outCmd = executable.toUrlishString();
} else {
if (executable.osType() == OsTypeWindows) {
*outCmd = qtcEnvironmentVariable("COMSPEC");
@@ -661,7 +661,7 @@ bool ProcessArgs::prepareCommand(const CommandLine &cmdLine, QString *outCmd, Pr
if (err != ProcessArgs::FoundMeta)
return false;
*outCmd = qtcEnvironmentVariable("SHELL", "/bin/sh");
- *outArgs = ProcessArgs::createUnixArgs({"-c", quoteArg(executable.toString()) + ' ' + arguments});
+ *outArgs = ProcessArgs::createUnixArgs({"-c", quoteArg(executable.toUrlishString()) + ' ' + arguments});
}
}
return true;
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index 690fbf4522a..f8c85c3179e 100644
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -899,7 +899,7 @@ bool DesktopDeviceFileAccess::hasHardLinks(const FilePath &filePath) const
#ifdef Q_OS_UNIX
struct stat s
{};
- const int r = stat(filePath.absoluteFilePath().toString().toLocal8Bit().constData(), &s);
+ const int r = stat(filePath.absoluteFilePath().toUrlishString().toLocal8Bit().constData(), &s);
if (r == 0) {
// check for hardlinks because these would break without the atomic write implementation
if (s.st_nlink > 1)
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index f9324634a12..206be6d695d 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -359,7 +359,7 @@ QString Environment::expandVariables(const QString &input) const
FilePath Environment::expandVariables(const FilePath &variables) const
{
- return FilePath::fromUserInput(expandVariables(variables.toString()));
+ return FilePath::fromUserInput(expandVariables(variables.toUrlishString()));
}
QStringList Environment::expandVariables(const QStringList &variables) const
diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp
index 693905bddc0..27476996246 100644
--- a/src/libs/utils/externalterminalprocessimpl.cpp
+++ b/src/libs/utils/externalterminalprocessimpl.cpp
@@ -107,7 +107,7 @@ expected_str<qint64> ProcessStubCreator::startStubProcess(const ProcessSetupData
{ExternalTerminalProcessImpl::openTerminalScriptAttached(), TerminalAppScriptDetached}},
};
- if (terminalMap.contains(terminal.command.toString())) {
+ if (terminalMap.contains(terminal.command.toUrlishString())) {
const QString env
= Utils::transform(setupData.m_environment.toStringList(), [](const QString &env) {
return CommandLine{"export", {env}}.toUserOutput();
@@ -139,8 +139,8 @@ expected_str<qint64> ProcessStubCreator::startStubProcess(const ProcessSetupData
| QFile::WriteGroup | QFile::WriteOther);
const QString script = (detached
- ? terminalMap.value(terminal.command.toString()).detached
- : terminalMap.value(terminal.command.toString()).attached)
+ ? terminalMap.value(terminal.command.toUrlishString()).detached
+ : terminalMap.value(terminal.command.toUrlishString()).attached)
.arg(shFile.fileName());
process->setCommand({"osascript", {"-"}});
diff --git a/src/libs/utils/filecrumblabel.cpp b/src/libs/utils/filecrumblabel.cpp
index e9e27c7a783..78052a6af50 100644
--- a/src/libs/utils/filecrumblabel.cpp
+++ b/src/libs/utils/filecrumblabel.cpp
@@ -34,7 +34,7 @@ void FileCrumbLabel::setPath(const FilePath &path)
links.prepend(linkForPath(current, fileName));
} else if (HostOsInfo::isWindowsHost() && current.isRootPath()) {
// Only on Windows add the drive letter, without the '/' at the end
- QString display = current.toString();
+ QString display = current.toUrlishString();
if (display.endsWith('/'))
display.chop(1);
links.prepend(linkForPath(current, display));
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index 3cef75e57c6..fdbcf816b3f 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -253,7 +253,7 @@ bool FileInProjectFinder::findFileOrDirectory(const FilePath &originalPath, File
while (prefixToIgnore != -1) {
QString candidateString = originalPath.toFSPathString();
candidateString.remove(0, prefixToIgnore);
- candidateString.prepend(m_projectDir.toString());
+ candidateString.prepend(m_projectDir.toUrlishString());
const FilePath candidate = FilePath::fromString(candidateString);
const int matchLength = origLength - prefixToIgnore;
// FIXME: This might be a worse match than what we find later.
@@ -261,7 +261,7 @@ bool FileInProjectFinder::findFileOrDirectory(const FilePath &originalPath, File
return handleSuccess(originalPath, {candidate}, matchLength,
"in project directory");
}
- prefixToIgnore = originalPath.toString().indexOf(separator, prefixToIgnore + 1);
+ prefixToIgnore = originalPath.toUrlishString().indexOf(separator, prefixToIgnore + 1);
}
}
@@ -275,9 +275,9 @@ bool FileInProjectFinder::findFileOrDirectory(const FilePath &originalPath, File
if (directoryHandler)
matches.append(pathSegmentsWithSameName(lastSegment));
- const QStringList matchedFilePaths = bestMatches(matches, originalPath.toString());
+ const QStringList matchedFilePaths = bestMatches(matches, originalPath.toUrlishString());
if (!matchedFilePaths.empty()) {
- const int matchLength = commonPostFixLength(matchedFilePaths.first(), originalPath.toString());
+ const int matchLength = commonPostFixLength(matchedFilePaths.first(), originalPath.toUrlishString());
FilePaths hits;
for (const QString &matchedFilePath : matchedFilePaths) {
if (checkPath(FilePath::fromString(matchedFilePath), matchLength, fileHandler, directoryHandler))
@@ -297,7 +297,7 @@ bool FileInProjectFinder::findFileOrDirectory(const FilePath &originalPath, File
// check if absolute path is found in sysroot
if (!m_sysroot.isEmpty()) {
- const FilePath sysrootPath = m_sysroot.pathAppended(originalPath.toString());
+ const FilePath sysrootPath = m_sysroot.pathAppended(originalPath.toUrlishString());
if (checkPath(sysrootPath, origLength, fileHandler, directoryHandler)) {
return handleSuccess(originalPath, {sysrootPath}, origLength, "in sysroot");
}
@@ -367,7 +367,7 @@ QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName)
QStringList result;
for (const FilePath &f : m_projectFiles) {
if (f.fileName() == fileName)
- result << f.toString();
+ result << f.toUrlishString();
}
return result;
}
@@ -379,8 +379,8 @@ QStringList FileInProjectFinder::pathSegmentsWithSameName(const QString &pathSeg
FilePath currentPath = f.parentDir();
do {
if (currentPath.fileName() == pathSegment) {
- if (result.isEmpty() || result.last() != currentPath.toString())
- result.append(currentPath.toString());
+ if (result.isEmpty() || result.last() != currentPath.toUrlishString())
+ result.append(currentPath.toUrlishString());
}
currentPath = currentPath.parentDir();
} while (!currentPath.isEmpty());
@@ -449,7 +449,7 @@ FilePaths FileInProjectFinder::QrcUrlFinder::find(const QUrl &fileUrl) const
for (const FilePath &f : m_allQrcFiles) {
QrcParser::Ptr &qrcParser = m_parserCache[f];
if (!qrcParser)
- qrcParser = QrcParser::parseQrcFile(f.toString(), QString());
+ qrcParser = QrcParser::parseQrcFile(f.toUrlishString(), QString());
if (!qrcParser->isValid())
continue;
qrcParser->collectFilesAtPath(QrcParser::normalizedQrcFilePath(fileUrl.toString()), &hits);
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index 32118cd56a4..773d29cac68 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -143,13 +143,14 @@ static bool isWindowsDriveLetter(QChar ch)
These are used to interface QVariant-based API, e.g.
settings or item model (internal) data.
- \li FilePath::fromString(), FilePath::toString()
+ \li FilePath::toUrlishString()
- These are used for internal interfaces to code areas that
- still use QString based file paths for simple storage and retrieval.
+ Converts the FilePath to a scheme://host/path string.
- In most cases, use of one of the more specialized above is
- more appropriate.
+ Mostly used in legacy code and for debugging reasons.
+
+ In almost all cases, use of one of the more specialized conversion
+ above is more appropriate.
\endlist
@@ -161,7 +162,7 @@ static bool isWindowsDriveLetter(QChar ch)
Communication with QVariant based Qt API should use \c fromVariant() and
\c toVariant().
- Uses of \c fromString() and \c toString() should be phased out by transforming
+ Uses of \c toUrlishString() should be phased out by transforming
code from QString based file path to FilePath. An exception here are
fragments of paths of a FilePath that are later used with \c pathAppended()
or similar which should be kept as QString.
@@ -295,7 +296,7 @@ QString decodeHost(QString host)
\sa toFSPathString()
*/
-QString FilePath::toString() const
+QString FilePath::toUrlishString() const
{
if (isLocal())
return path();
@@ -394,7 +395,7 @@ QUrl FilePath::toUrl() const
*/
QString FilePath::toUserOutput() const
{
- QString tmp = toString();
+ QString tmp = toUrlishString();
if (!isLocal())
return tmp;
@@ -454,7 +455,7 @@ QString FilePath::fileNameWithPathComponents(int pathComponents) const
return fullPath.mid(component);
// If there are no more slashes before the found one, return the entire string
- return toString();
+ return toUrlishString();
}
/*!
@@ -1189,7 +1190,7 @@ QString FilePath::displayName(const QString &args) const
To create FilePath objects from strings possibly containing backslashes as
path separator, use \c fromUserInput.
- \sa toString, fromUserInput
+ \sa toFSPathString, toUserOutput, fromUserInput
*/
FilePath FilePath::fromString(const QString &filepath)
{
@@ -1497,7 +1498,7 @@ FilePath FilePath::fromSettings(const QVariant &variant)
QVariant FilePath::toSettings() const
{
- return toString();
+ return toUrlishString();
}
/*!
@@ -1915,7 +1916,7 @@ void FilePath::removeDuplicates(FilePaths &files)
{
// FIXME: Improve.
// FIXME: This drops the osType information, which is not correct.
- QStringList list = transform<QStringList>(files, &FilePath::toString);
+ QStringList list = transform<QStringList>(files, &FilePath::toUrlishString);
list.removeDuplicates();
files = FileUtils::toFilePathList(list);
}
@@ -1965,7 +1966,7 @@ FilePath FilePath::pathAppended(const QString &path) const
FilePath FilePath::stringAppended(const QString &str) const
{
- return FilePath::fromString(toString() + str);
+ return FilePath::fromString(toUrlishString() + str);
}
std::optional<FilePath> FilePath::tailRemoved(const QString &str) const
@@ -2047,7 +2048,7 @@ Result FilePath::copyFile(const FilePath &target) const
if (!target.setPermissions(perms)) {
target.removeFile();
return Result::Error(
- Tr::tr("Could not set permissions on \"%1\"").arg(target.toString()));
+ Tr::tr("Could not set permissions on \"%1\"").arg(target.toUrlishString()));
}
return Result::Ok;
@@ -2279,7 +2280,7 @@ QString FilePath::shortNativePath() const
const FilePath home = FileUtils::homePath();
if (isChildOf(home)) {
return QLatin1Char('~') + QDir::separator()
- + QDir::toNativeSeparators(relativeChildPath(home).toString());
+ + QDir::toNativeSeparators(relativeChildPath(home).toUrlishString());
}
}
return toUserOutput();
@@ -2363,10 +2364,10 @@ FilePath FilePath::cleanPath() const
QString FilePath::withTildeHomePath() const
{
if (osType() == OsTypeWindows)
- return toString();
+ return toUrlishString();
if (!isLocal())
- return toString();
+ return toUrlishString();
static const QString homePath = QDir::homePath();
@@ -2374,12 +2375,12 @@ QString FilePath::withTildeHomePath() const
if (outPath.startsWith(homePath))
return '~' + outPath.mid(homePath.size());
- return toString();
+ return toUrlishString();
}
QTextStream &operator<<(QTextStream &s, const FilePath &fn)
{
- return s << fn.toString();
+ return s << fn.toUrlishString();
}
// FileFilter
@@ -2546,7 +2547,7 @@ QTCREATOR_UTILS_EXPORT size_t qHash(const FilePath &filePath)
QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug dbg, const FilePath &c)
{
- return dbg << c.toString();
+ return dbg << c.toUrlishString();
}
class TemporaryFilePathPrivate
diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h
index 35694346082..02de3b9cca2 100644
--- a/src/libs/utils/filepath.h
+++ b/src/libs/utils/filepath.h
@@ -314,7 +314,8 @@ public:
expected_str<FilePath> localSource() const;
// FIXME: Avoid. See toSettings, toVariant, toUserOutput, toFSPathString, path, nativePath.
- QString toString() const;
+ QString toUrlishString() const;
+ [[deprecated]] QString toString() const { return toUrlishString(); }
bool equalsCaseSensitive(const FilePath &other) const;
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 772166f163f..d1ebe9065ba 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -461,7 +461,7 @@ static QList<QRegularExpression> filtersToRegExps(const QStringList &filters)
static bool matches(const QList<QRegularExpression> &exprList, const FilePath &filePath)
{
return Utils::anyOf(exprList, [&filePath](const QRegularExpression &reg) {
- return (reg.match(filePath.toString()).hasMatch()
+ return (reg.match(filePath.toUrlishString()).hasMatch()
|| reg.match(filePath.fileName()).hasMatch());
});
}
diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp
index 2f426935989..931670c7b2a 100644
--- a/src/libs/utils/filesystemwatcher.cpp
+++ b/src/libs/utils/filesystemwatcher.cpp
@@ -461,7 +461,7 @@ void FileSystemWatcher::slotDirectoryChanged(const QString &path)
QStringList toReadd;
const auto dir = FilePath::fromString(path);
for (const FilePath &entry : dir.dirEntries(QDir::Files)) {
- const QString file = entry.toString();
+ const QString file = entry.toUrlishString();
if (d->m_files.contains(file))
toReadd.append(file);
}
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index e0f48d7234f..9da422b0fc4 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -297,7 +297,7 @@ TempFileSaver::~TempFileSaver()
{
m_file.reset();
if (m_autoRemove)
- QFile::remove(m_filePath.toString());
+ QFile::remove(m_filePath.toUrlishString());
}
/*!
@@ -700,7 +700,7 @@ bool copyRecursively(const FilePath &srcFilePath,
}
return false;
}
- const QDir sourceDir(srcFilePath.toString());
+ const QDir sourceDir(srcFilePath.toUrlishString());
const QStringList fileNames = sourceDir.entryList(
QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
for (const QString &fileName : fileNames) {
diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp
index 2410b8bea2b..e8785e283b9 100644
--- a/src/libs/utils/filewizardpage.cpp
+++ b/src/libs/utils/filewizardpage.cpp
@@ -105,7 +105,7 @@ void FileWizardPage::setFilePath(const FilePath &filePath)
QString FileWizardPage::path() const
{
- return d->m_pathChooser->filePath().toString();
+ return d->m_pathChooser->filePath().toUrlishString();
}
void FileWizardPage::setPath(const QString &path)
diff --git a/src/libs/utils/fsengine/fixedlistfsengine.h b/src/libs/utils/fsengine/fixedlistfsengine.h
index 6696fa7a258..9f8e431a1b9 100644
--- a/src/libs/utils/fsengine/fixedlistfsengine.h
+++ b/src/libs/utils/fsengine/fixedlistfsengine.h
@@ -41,7 +41,7 @@ public:
case QAbstractFileEngine::AbsoluteName:
case QAbstractFileEngine::DefaultName:
case QAbstractFileEngine::CanonicalName:
- return chopIfEndsWith(m_filePath.toString(), '/');
+ return chopIfEndsWith(m_filePath.toUrlishString(), '/');
break;
case QAbstractFileEngine::BaseName:
if (m_filePath.fileName().isEmpty())
@@ -51,7 +51,7 @@ public:
case QAbstractFileEngine::PathName:
case QAbstractFileEngine::AbsolutePathName:
case QAbstractFileEngine::CanonicalPathName:
- return chopIfEndsWith(m_filePath.parentDir().toString(), '/');
+ return chopIfEndsWith(m_filePath.parentDir().toUrlishString(), '/');
break;
default:
diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp
index b9bd8bb810a..ef22755b8b9 100644
--- a/src/libs/utils/fsengine/fsenginehandler.cpp
+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
@@ -552,7 +552,7 @@ FSEngineHandler::create(const QString &fileName) const
if (fixedFileName.startsWith(rootPath)) {
const QStringList deviceSchemes = FSEngine::registeredDeviceSchemes();
for (const QString &scheme : deviceSchemes) {
- if (fixedFileName == rootFilePath.pathAppended(scheme).toString()) {
+ if (fixedFileName == rootFilePath.pathAppended(scheme).toUrlishString()) {
const FilePaths filteredRoots = Utils::filtered(FSEngine::registeredDeviceRoots(),
[scheme](const FilePath &root) {
return root.scheme() == scheme;
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index 4846a9753b3..7d5cccd6e54 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -41,9 +41,9 @@ static MasksAndColors masksAndColors(const QList<IconMaskAndColor> &icon, int dp
{
MasksAndColors result;
for (const IconMaskAndColor &i: icon) {
- const QString &fileName = i.first.toString();
+ const QString &fileName = i.first.toUrlishString();
const QColor color = creatorColor(i.second);
- const QString dprFileName = StyleHelper::availableImageResolutions(i.first.toString())
+ const QString dprFileName = StyleHelper::availableImageResolutions(i.first.toUrlishString())
.contains(dpr)
? StyleHelper::imageFileWithResolution(fileName, dpr)
: fileName;
@@ -171,7 +171,7 @@ QIcon Icon::icon() const
return QIcon();
if (m_style == None)
- return QIcon(m_iconSourceList.constFirst().first.toString());
+ return QIcon(m_iconSourceList.constFirst().first.toUrlishString());
const int maxDpr = qRound(qApp->devicePixelRatio());
if (maxDpr == m_lastDevicePixelRatio)
@@ -204,7 +204,7 @@ QPixmap Icon::pixmap(QIcon::Mode iconMode) const
if (m_iconSourceList.isEmpty()) {
return QPixmap();
} else if (m_style == None) {
- return QPixmap(StyleHelper::dpiSpecificImageFile(m_iconSourceList.constFirst().first.toString()));
+ return QPixmap(StyleHelper::dpiSpecificImageFile(m_iconSourceList.constFirst().first.toUrlishString()));
} else {
const MasksAndColors masks =
masksAndColors(m_iconSourceList, qRound(qApp->devicePixelRatio()));
diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index 3037caf383e..667bd1c6d91 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -389,7 +389,7 @@ FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const
// We also cannot just operate on the scheme, host and path component
// individually as we want to allow single variables to expand to fully
// remote-qualified paths.
- return FilePath::fromUserInput(expand(fileNameWithVariables.toString()));
+ return FilePath::fromUserInput(expand(fileNameWithVariables.toUrlishString()));
}
QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index bf25e3bec40..1ebf151a2e7 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -42,7 +42,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QString, linkSep, {"::"})
QString OutputLineParser::createLinkTarget(const FilePath &filePath, int line = -1, int column = -1)
{
- return *linkPrefix() + filePath.toString() + *linkSep() + QString::number(line)
+ return *linkPrefix() + filePath.toUrlishString() + *linkSep() + QString::number(line)
+ *linkSep() + QString::number(column);
}
@@ -130,7 +130,7 @@ FilePath OutputLineParser::absoluteFilePath(const FilePath &filePath) const
if (candidates.count() == 1)
return candidates.first();
- QString fp = filePath.toString();
+ QString fp = filePath.toUrlishString();
while (fp.startsWith("../"))
fp.remove(0, 3);
bool found = false;
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 7c735debed0..84295f626a2 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -233,7 +233,7 @@ FilePath PathChooserPrivate::expandedPath(const FilePath &input) const
// as 'cD:\\dev\\build-project' is considered is handled as being relative
// input = "cD:\\dev\build-project"; // prepended 'c' to change the device letter
// m_baseDirectory = "D:\\dev\\project"
- if (fp.isLocal() && HostOsInfo::isWindowsHost() && fp.toString().count(':') > 1)
+ if (fp.isLocal() && HostOsInfo::isWindowsHost() && fp.toUrlishString().count(':') > 1)
return path;
return fp;
}
@@ -334,9 +334,9 @@ FilePath PathChooser::baseDirectory() const
void PathChooser::setEnvironment(const Environment &env)
{
- QString oldExpand = filePath().toString();
+ QString oldExpand = filePath().toUrlishString();
d->m_environment = env;
- if (filePath().toString() != oldExpand) {
+ if (filePath().toUrlishString() != oldExpand) {
triggerChanged();
emit rawPathChanged();
}
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index b0d70e90b8f..236bdc2b3b0 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -149,7 +149,7 @@ signals:
private:
// Deprecated, only used in property getter.
// Use filePath().toString() or better suitable conversions.
- QString path() const { return filePath().toString(); }
+ QString path() const { return filePath().toUrlishString(); }
// Returns overridden title or the one from <title>
QString makeDialogTitle(const QString &title);
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 292a317228c..32e0e215968 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -204,7 +204,7 @@ void Theme::readSettingsInternal(QSettings &settings)
const Utils::FilePath includedPath = path.parentDir().pathAppended(include);
if (includedPath.exists()) {
- QSettings themeSettings(includedPath.toString(), QSettings::IniFormat);
+ QSettings themeSettings(includedPath.toUrlishString(), QSettings::IniFormat);
readSettingsInternal(themeSettings);
} else {
qWarning("Theme \"%s\" misses include \"%s\".",
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 04:07:11 +0000