diff options
Diffstat (limited to 'src')
433 files changed, 1129 insertions, 1126 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 51e595b900a..955f085f9a8 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -60,7 +60,7 @@ void FastPreprocessor::sourceNeeded(int line, const FilePath &filePath, IncludeT if (_addIncludesToCurrentDoc) { // CHECKME: Is that cleanPath needed? const FilePath cleanPath = filePath.cleanPath(); - _currentDoc->addIncludeFile(Document::Include(filePath.toString(), cleanPath, line, mode)); + _currentDoc->addIncludeFile(Document::Include(filePath.toUrlishString(), cleanPath, line, mode)); } mergeEnvironment(filePath); } diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 32de4afb894..d408d1e2cb5 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -749,7 +749,7 @@ QByteArray Preprocessor::run(const Utils::FilePath &filePath, bool noLines, bool markGeneratedTokens) { - return run(filePath.toString(), source, noLines, markGeneratedTokens); + return run(filePath.toUrlishString(), source, noLines, markGeneratedTokens); } QByteArray Preprocessor::run(const QString &fileName, diff --git a/src/libs/gocmdbridge/client/bridgedfileaccess.cpp b/src/libs/gocmdbridge/client/bridgedfileaccess.cpp index 250f4e9c42e..17d3b99fd4a 100644 --- a/src/libs/gocmdbridge/client/bridgedfileaccess.cpp +++ b/src/libs/gocmdbridge/client/bridgedfileaccess.cpp @@ -669,7 +669,7 @@ void FileAccess::iterateDirectory(const FilePath &filePath, } processResults(); - qCDebug(faLog) << "Iterated directory" << filePath.toString() << "in" << t.elapsed() << "ms"; + qCDebug(faLog) << "Iterated directory" << filePath.toUrlishString() << "in" << t.elapsed() << "ms"; } } // namespace CmdBridge diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp index 5829de75d9b..e6d99ab18c7 100644 --- a/src/libs/languageserverprotocol/lsptypes.cpp +++ b/src/libs/languageserverprotocol/lsptypes.cpp @@ -342,7 +342,7 @@ bool DocumentFilter::applies(const Utils::FilePath &fileName, const Utils::MimeT if (fileName.caseSensitivity() == Qt::CaseInsensitive) option = QRegularExpression::CaseInsensitiveOption; const QRegularExpression regexp(expressionForGlob(*_pattern), option); - if (regexp.isValid() && regexp.match(fileName.toString()).hasMatch()) + if (regexp.isValid() && regexp.match(fileName.toUrlishString()).hasMatch()) return true; } if (std::optional<QString> _lang = language()) { @@ -351,7 +351,7 @@ bool DocumentFilter::applies(const Utils::FilePath &fileName, const Utils::MimeT }; if (mimeType.isValid() && match(mimeType)) return true; - return Utils::anyOf(Utils::mimeTypesForFileName(fileName.toString()), match); + return Utils::anyOf(Utils::mimeTypesForFileName(fileName.toUrlishString()), match); } // return false when any of the filter didn't match but return true when no filter was defined return !contains(schemeKey) && !contains(languageKey) && !contains(patternKey); diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.cpp b/src/libs/modelinglib/qmt/controller/namecontroller.cpp index 2f9506d3fe5..fad5cfc730f 100644 --- a/src/libs/modelinglib/qmt/controller/namecontroller.cpp +++ b/src/libs/modelinglib/qmt/controller/namecontroller.cpp @@ -120,7 +120,7 @@ QStringList NameController::buildElementsPath(const FilePath &filePath, { QList<QString> relativeElements; - QStringList split = filePath.toString().split("/"); + QStringList split = filePath.toUrlishString().split("/"); QStringList::const_iterator splitEnd = split.constEnd(); if (ignoreLastFilePathPart || split.last().isEmpty()) --splitEnd; diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index b9fa153386e..420a5bd9c54 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -126,7 +126,7 @@ void Document::setLanguage(Dialect l) QString Document::importId() const { - return _fileName.toString(); + return _fileName.toUrlishString(); } QByteArray Document::fingerprint() const @@ -458,7 +458,7 @@ void Snapshot::insert(const Document::Ptr &document, bool allowInvalid) cImport.importId = document->importId(); cImport.language = document->language(); cImport.addPossibleExport( - Export(ImportKey(ImportType::File, fileName.toString()), {}, true, fileName.baseName())); + Export(ImportKey(ImportType::File, fileName.toUrlishString()), {}, true, fileName.baseName())); cImport.fingerprint = document->fingerprint(); _dependencies.addCoreImport(cImport); } @@ -471,7 +471,7 @@ void Snapshot::insertLibraryInfo(const Utils::FilePath &path, const LibraryInfo _libraries.insert(path.cleanPath(), info); if (!info.wasFound()) return; CoreImport cImport; - cImport.importId = path.toString(); + cImport.importId = path.toUrlishString(); cImport.language = Dialect::AnyLanguage; QSet<ImportKey> packages; for (const ModuleApiInfo &moduleInfo : info.moduleApis()) { diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 40198809be7..f3fc4614e46 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -477,7 +477,7 @@ Import LinkPrivate::importNonFile(const Document::Ptr &doc, const ImportInfo &im "For qmlRegister... calls, make sure that you define the Module URI as a string literal.\n") .arg(importInfo.name(), Utils::transform(m_importPaths, [](const Utils::FilePath &p) { - return p.toString(); + return p.toUrlishString(); }).join("\n"))); } @@ -560,7 +560,7 @@ bool LinkPrivate::importLibrary(const Document::Ptr &doc, .arg(importName, importInfo.name(), Utils::transform(m_importPaths, [](const Utils::FilePath &p) { - return p.toString(); + return p.toUrlishString(); }).join(QLatin1Char('\n')))); } } else if (!subImport.valid) { @@ -608,7 +608,7 @@ bool LinkPrivate::importLibrary(const Document::Ptr &doc, } } else { const QString packageName = importInfo.name(); - m_valueOwner->cppQmlTypes().load(libraryPath.toString(), + m_valueOwner->cppQmlTypes().load(libraryPath.toUrlishString(), libraryInfo.metaObjects(), packageName); const auto objects = m_valueOwner->cppQmlTypes().createObjectsForImport(packageName, diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 9da07607708..014ff0909da 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -536,7 +536,7 @@ QStringList ModelManagerInterface::qrcPathsForFile(const Utils::FilePath &file, { QStringList res; iterateQrcFiles(project, resources, [&](const QrcParser::ConstPtr &qrcFile) { - qrcFile->collectResourceFilesForSourceFile(file.toString(), &res, locale); + qrcFile->collectResourceFilesForSourceFile(file.toUrlishString(), &res, locale); }); return res; } @@ -638,11 +638,11 @@ void ModelManagerInterface::updateProjectInfo(const ProjectInfo &pinfo, ProjectE // update qrc cache m_qrcContents = pinfo.resourceFileContents; for (const Utils::FilePath &newQrc : std::as_const(pinfo.allResourceFiles)) - m_qrcCache.addPath(newQrc.toString(), m_qrcContents.value(newQrc)); + m_qrcCache.addPath(newQrc.toUrlishString(), m_qrcContents.value(newQrc)); for (const Utils::FilePath &newQrc : pinfo.generatedQrcFiles) - m_qrcCache.addPath(newQrc.toString(), m_qrcContents.value(newQrc)); + m_qrcCache.addPath(newQrc.toUrlishString(), m_qrcContents.value(newQrc)); for (const Utils::FilePath &oldQrc : std::as_const(oldInfo.allResourceFiles)) - m_qrcCache.removePath(oldQrc.toString()); + m_qrcCache.removePath(oldQrc.toUrlishString()); m_pluginDumper->loadBuiltinTypes(pinfo); emit projectInfoUpdated(pinfo); @@ -721,7 +721,7 @@ void ModelManagerInterface::emitDocumentChangedOnDisk(Document::Ptr doc) void ModelManagerInterface::updateQrcFile(const Utils::FilePath &path) { - m_qrcCache.updatePath(path.toString(), m_qrcContents.value(path)); + m_qrcCache.updatePath(path.toUrlishString(), m_qrcContents.value(path)); } void ModelManagerInterface::updateDocument(const Document::Ptr &doc) @@ -876,7 +876,7 @@ bool ModelManagerInterface::findNewQmlApplicationInPath( qmltypesFile = qmlTypes.first(); - LibraryInfo libraryInfo = LibraryInfo(qmltypesFile.toString()); + LibraryInfo libraryInfo = LibraryInfo(qmltypesFile.toUrlishString()); const Utils::FilePath libraryPath = path.absolutePath(); newLibraries->insert(libraryPath); modelManager->updateLibraryInfo(path, libraryInfo, lock); diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index ad327cb5f85..e34ce53d7f9 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -92,7 +92,7 @@ void PluginDumper::onLoadBuiltinTypes(const QmlJS::ModelManagerInterface::Projec } runQmlDump(info, QStringList(QLatin1String("--builtins")), info.qtQmlPath); - m_qtToInfo.insert(info.qtQmlPath.toString(), info); + m_qtToInfo.insert(info.qtQmlPath.toUrlishString(), info); } void PluginDumper::onLoadPluginTypes(const Utils::FilePath &libraryPath, @@ -342,7 +342,7 @@ QFuture<PluginDumper::QmlTypeDescription> PluginDumper::loadQmlTypeDescription(c QList<ModuleApiInfo> apis; QStringList deps; CppQmlTypesLoader::parseQmlTypeDescriptions(reader.text(), &objs, &apis, &deps, - &error, &warning, p.toString()); + &error, &warning, p.toUrlishString()); if (!error.isEmpty()) { result.errors += Tr::tr("Failed to parse \"%1\".\nError: %2").arg(p.toUserOutput(), error); } else { @@ -419,7 +419,7 @@ QFuture<PluginDumper::DependencyInfo> PluginDumper::loadDependencies(const FileP FilePaths dependenciesPaths; FilePath path; for (const FilePath &name : dependencies) { - path = buildQmltypesPath(name.toString()); + path = buildQmltypesPath(name.toUrlishString()); if (!path.isEmpty()) dependenciesPaths << path; visited->insert(name); @@ -557,7 +557,7 @@ void PluginDumper::prepareLibraryInfo(LibraryInfo &libInfo, if (!warnings.isEmpty()) printParseWarnings(libraryPath, warnings.join(QLatin1String("\n"))); - applyQt515MissingImportWorkaround(libraryPath.toString(), libInfo); + applyQt515MissingImportWorkaround(libraryPath.toUrlishString(), libInfo); libInfo.updateFingerprint(); } @@ -662,7 +662,7 @@ void PluginDumper::dump(const Plugin &plugin) args << plugin.importUri; args << plugin.importVersion; args << (plugin.importPath.isEmpty() ? Utils::FilePath::fromString(".") : plugin.importPath) - .toString(); + .toUrlishString(); runQmlDump(info, args, plugin.qmldirPath); } diff --git a/src/libs/qmljs/qmljsscopechain.cpp b/src/libs/qmljs/qmljsscopechain.cpp index 234bca685e3..0799a702088 100644 --- a/src/libs/qmljs/qmljsscopechain.cpp +++ b/src/libs/qmljs/qmljsscopechain.cpp @@ -332,7 +332,7 @@ void ScopeChain::initializeRootScope() for (Document::Ptr otherDoc : snapshot) { for (const ImportInfo &import : otherDoc->bind()->imports()) { if ((import.type() == ImportType::File - && m_document->fileName().toString() == import.path()) + && m_document->fileName().toUrlishString() == import.path()) || (import.type() == ImportType::QrcFile && ModelManagerInterface::instance() ->filesAtQrcPath(import.path()) 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 ®) { - 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\".", diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index 5e61e8ea07a..c87e39dbf3d 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/src/plugins/autotest/autotestunittests.cpp @@ -284,7 +284,7 @@ void AutotestUnitTests::testCodeParserBoostTest() QMap<QString, int> expectedSuitesAndTests; auto pathConstructor = [basePath, extension](const QString &name, const QString &subPath) { - return QString(name + '|' + basePath.pathAppended(subPath + extension).toString()); + return QString(name + '|' + basePath.pathAppended(subPath + extension).toUrlishString()); }; expectedSuitesAndTests.insert(pathConstructor("Master Test Suite", "tests/deco/deco"), 2); // decorators w/o suite expectedSuitesAndTests.insert(pathConstructor("Master Test Suite", "tests/fix/fix"), 2); // fixtures diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 6b069f6c51c..2d97f8bdeb5 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -879,7 +879,7 @@ QMap<QString, int> TestTreeModel::boostTestSuitesAndTests() const if (TestTreeItem *rootNode = boostTestRootNode()) { rootNode->forFirstLevelChildItems([&result](TestTreeItem *child) { - result.insert(child->name() + '|' + child->proFile().toString(), child->childCount()); + result.insert(child->name() + '|' + child->proFile().toUrlishString(), child->childCount()); }); } return result; diff --git a/src/plugins/axivion/axivionperspective.cpp b/src/plugins/axivion/axivionperspective.cpp index e99f906488d..41a59acdbf6 100644 --- a/src/plugins/axivion/axivionperspective.cpp +++ b/src/plugins/axivion/axivionperspective.cpp @@ -98,7 +98,7 @@ static std::optional<PathMapping> findPathMappingMatch(const QString &projectNam if (mapping.analysisPath.isEmpty()) return mapping; - QString analysis = mapping.analysisPath.toString(); + QString analysis = mapping.analysisPath.toUrlishString(); // ensure we use complete paths if (!analysis.endsWith('/')) analysis.append('/'); @@ -148,9 +148,9 @@ public: if (const std::optional<Dto::ProjectInfoDto> pInfo = projectInfo()) { if (auto mapping = findPathMappingMatch(pInfo->name, link)) { std::optional<FilePath> fp = link.targetFilePath.prefixRemoved( - mapping->analysisPath.toString()); + mapping->analysisPath.toUrlishString()); QTC_CHECK(fp); - fp = mapping->localPath.pathAppended(fp->toString()); + fp = mapping->localPath.pathAppended(fp->toUrlishString()); if (fp->exists()) targetFilePath = *fp; } diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index 4bbcce1fed8..8a3072a47fd 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -2165,7 +2165,7 @@ void ClangdTestExternalChanges::test() // Break a header file that is used, but not open in Creator. // Neither we nor the server should notice, and no diagnostics should be shown for the // source file that includes the now-broken header. - QFile header(project()->projectDirectory().toString() + "/mainwindow.h"); + QFile header(project()->projectDirectory().toUrlishString() + "/mainwindow.h"); QVERIFY(header.open(QIODevice::WriteOnly)); header.write("blubb"); header.close(); @@ -2184,7 +2184,7 @@ void ClangdTestExternalChanges::test() // verify that we get a new client and diagnostics in the current editor. TextDocument * const docToChange = document("mainwindow.cpp"); docToChange->setSilentReload(); - QFile otherSource(filePath("mainwindow.cpp").toString()); + QFile otherSource(filePath("mainwindow.cpp").toUrlishString()); QVERIFY(otherSource.open(QIODevice::WriteOnly)); otherSource.write("blubb"); otherSource.close(); diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index bc347813720..182d6359682 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -259,7 +259,7 @@ QString projectUniqueId(ProjectExplorer::Project *project) if (!project) return QString(); - return QString::fromUtf8(QCryptographicHash::hash(project->projectFilePath().toString().toUtf8(), + return QString::fromUtf8(QCryptographicHash::hash(project->projectFilePath().toUrlishString().toUtf8(), QCryptographicHash::Md5) .toHex(0)); } diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp index 69369803645..6ecc765efc8 100644 --- a/src/plugins/clangtools/diagnosticconfigswidget.cpp +++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp @@ -401,7 +401,7 @@ static void buildTree(ProjectExplorer::Tree *parent, current->name = node.name; current->isDir = node.children.size(); if (parent) { - current->fullPath = Utils::FilePath::fromString(parent->fullPath.toString() + current->fullPath = Utils::FilePath::fromString(parent->fullPath.toUrlishString() + current->name); parent->childDirectories.push_back(current); } else { @@ -413,9 +413,9 @@ static void buildTree(ProjectExplorer::Tree *parent, } static bool needsLink(ProjectExplorer::Tree *node) { - if (node->fullPath.toString() == "clang-analyzer-") + if (node->fullPath.toUrlishString() == "clang-analyzer-") return true; - return !node->isDir && !node->fullPath.toString().startsWith("clang-analyzer-"); + return !node->isDir && !node->fullPath.toUrlishString().startsWith("clang-analyzer-"); } class BaseChecksTreeModel : public ProjectExplorer::SelectableFilesModel // FIXME: This isn't about files. @@ -591,7 +591,7 @@ public: // 'clang-analyzer-' group if (node->isDir) return CppEditor::Constants::CLANG_STATIC_ANALYZER_DOCUMENTATION_URL; - return clangTidyDocUrl(node->fullPath.toString()); + return clangTidyDocUrl(node->fullPath.toUrlishString()); } return BaseChecksTreeModel::data(fullIndex, role); @@ -629,7 +629,7 @@ private: return false; auto *node = static_cast<Tree *>(index.internalPointer()); - const QString nodeName = node->fullPath.toString(); + const QString nodeName = node->fullPath.toUrlishString(); if ((check.endsWith("*") && nodeName.startsWith(check.left(check.length() - 1))) || (!node->isDir && nodeName == check)) { result = index; @@ -646,7 +646,7 @@ private: if (root->checked == Qt::Unchecked) return; if (root->checked == Qt::Checked) { - checks += "," + root->fullPath.toString(); + checks += "," + root->fullPath.toUrlishString(); if (root->isDir) checks += "*"; return; diff --git a/src/plugins/clangtools/readexporteddiagnosticstest.cpp b/src/plugins/clangtools/readexporteddiagnosticstest.cpp index 38bbee73908..e6242713d3a 100644 --- a/src/plugins/clangtools/readexporteddiagnosticstest.cpp +++ b/src/plugins/clangtools/readexporteddiagnosticstest.cpp @@ -266,7 +266,7 @@ FilePath ReadExportedDiagnosticsTest::createFile(const Utils::FilePath &yamlFile FileReader reader; if (QTC_GUARD(reader.fetch(yamlFilePath))) { QByteArray contents = reader.text(); - contents.replace("FILE_PATH", filePathToInject.toString().toLocal8Bit()); + contents.replace("FILE_PATH", filePathToInject.toUrlishString().toLocal8Bit()); FileSaver fileSaver(newFileName, QIODevice::WriteOnly | QIODevice::Text); QTC_CHECK(fileSaver.write(contents)); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 25f4e12e794..f009dfd315c 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -997,7 +997,7 @@ bool CMakeBuildSystem::renameFile( { const FilePath projDir = context->filePath().canonicalPath(); const FilePath newRelPath = newFilePath.canonicalPath().relativePathFrom(projDir).cleanPath(); - const QString newRelPathName = newRelPath.toString(); + const QString newRelPathName = newRelPath.toUrlishString(); const QString targetName = context->buildKey(); const QString key @@ -2483,7 +2483,7 @@ void CMakeBuildSystem::runGenerator(Id id) const FilePath outDir = buildConfiguration()->buildDirectory() / ("qtc_" + FileUtils::fileSystemFriendlyName(generator)); if (!outDir.ensureWritableDir()) { - showError(Tr::tr("Cannot create output directory \"%1\".").arg(outDir.toString())); + showError(Tr::tr("Cannot create output directory \"%1\".").arg(outDir.toUrlishString())); return; } CommandLine cmdLine(cmakeTool->cmakeExecutable(), {"-S", buildConfiguration()->target() diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index e55a49132ce..7d74a891eeb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -863,7 +863,7 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath, TaskHub::requestPopup(); } } else { - QString cmakeExecutable = configurePreset.cmakeExecutable.value().toString(); + QString cmakeExecutable = configurePreset.cmakeExecutable.value().toUrlishString(); CMakePresets::Macros::expand(configurePreset, env, projectDirectory(), cmakeExecutable); configurePreset.cmakeExecutable = FilePath::fromUserInput(cmakeExecutable); @@ -937,7 +937,7 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath, updateCompilerPaths(config, env); config << CMakeConfigItem("CMAKE_COMMAND", CMakeConfigItem::PATH, - configurePreset.cmakeExecutable.value().toString().toUtf8()); + configurePreset.cmakeExecutable.value().toUrlishString().toUtf8()); if (configurePreset.generator) config << CMakeConfigItem("CMAKE_GENERATOR", CMakeConfigItem::STRING, @@ -1396,7 +1396,7 @@ void CMakeProjectImporterTest::testCMakeProjectImporterToolchain() QCOMPARE(tcs.count(), expectedLanguages.count()); for (int i = 0; i < tcs.count(); ++i) { QCOMPARE(tcs.at(i).language, expectedLanguages.at(i)); - QCOMPARE(tcs.at(i).compilerPath.toString(), expectedToolchains.at(i)); + QCOMPARE(tcs.at(i).compilerPath.toUrlishString(), expectedToolchains.at(i)); } } diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 75b9f981edd..9effaa9070b 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -207,7 +207,7 @@ FilePath CMakeTool::qchFilePath() const FilePath CMakeTool::cmakeExecutable(const FilePath &path) { if (path.osType() == OsTypeMac) { - const QString executableString = path.toString(); + const QString executableString = path.toUrlishString(); const int appIndex = executableString.lastIndexOf(".app"); const int appCutIndex = appIndex + 4; const bool endsWithApp = appIndex >= 0 && appCutIndex >= executableString.size(); diff --git a/src/plugins/coreplugin/corejsextensions.cpp b/src/plugins/coreplugin/corejsextensions.cpp index 462459d3555..d28d4c0f190 100644 --- a/src/plugins/coreplugin/corejsextensions.cpp +++ b/src/plugins/coreplugin/corejsextensions.cpp @@ -38,7 +38,7 @@ QString UtilsJsExtension::qtCreatorIdeVersion() const QString UtilsJsExtension::qtCreatorSettingsPath() const { - return Core::ICore::userResourcePath().toString(); + return Core::ICore::userResourcePath().toUrlishString(); } QString UtilsJsExtension::toNativeSeparators(const QString &in) const @@ -125,7 +125,7 @@ QString UtilsJsExtension::preferredSuffix(const QString &mimetype) const QString UtilsJsExtension::fileName(const QString &path, const QString &extension) const { - return Utils::FilePath::fromStringWithExtension(path, extension).toString(); + return Utils::FilePath::fromStringWithExtension(path, extension).toUrlishString(); } QString UtilsJsExtension::mktemp(const QString &pattern) const diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 1e3181a23f4..1aef8c04557 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -234,7 +234,7 @@ static void addToPathChooserContextMenu(PathChooser *pathChooser, QMenu *menu) } else { auto mkPathAct = new QAction(Tr::tr("Create Folder"), menu); QObject::connect(mkPathAct, &QAction::triggered, pathChooser, [pathChooser] { - QDir().mkpath(pathChooser->filePath().toString()); + QDir().mkpath(pathChooser->filePath().toUrlishString()); pathChooser->triggerChanged(); }); menu->insertAction(firstAction, mkPathAct); @@ -305,9 +305,9 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) [] { return QLocale::system() .toString(QTime::currentTime(), QLocale::ShortFormat); }); expander->registerVariable("Config:DefaultProjectDirectory", Tr::tr("The configured default directory for projects."), - [] { return DocumentManager::projectsDirectory().toString(); }); + [] { return DocumentManager::projectsDirectory().toUrlishString(); }); expander->registerVariable("Config:LastFileDialogDirectory", Tr::tr("The directory last visited in a file dialog."), - [] { return DocumentManager::fileDialogLastVisitedDirectory().toString(); }); + [] { return DocumentManager::fileDialogLastVisitedDirectory().toUrlishString(); }); expander->registerVariable("HostOs:isWindows", Tr::tr("Is %1 running on Windows?") .arg(QGuiApplication::applicationDisplayName()), @@ -340,11 +340,11 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) expander->registerVariable("IDE:ResourcePath", Tr::tr("The directory where %1 finds its pre-installed resources.") .arg(QGuiApplication::applicationDisplayName()), - [] { return ICore::resourcePath().toString(); }); + [] { return ICore::resourcePath().toUrlishString(); }); expander->registerVariable("IDE:UserResourcePath", Tr::tr("The directory where %1 puts custom user data.") .arg(QGuiApplication::applicationDisplayName()), - [] { return ICore::userResourcePath().toString(); }); + [] { return ICore::userResourcePath().toUrlishString(); }); expander->registerPrefix("CurrentDate:", Tr::tr("The current date (QDate formatstring)."), [](const QString &fmt) { return QDate::currentDate().toString(fmt); }); expander->registerPrefix("CurrentTime:", Tr::tr("The current time (QTime formatstring)."), diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp index c0ef31cc00d..2435326054a 100644 --- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp @@ -105,7 +105,7 @@ FilePropertiesDialog::~FilePropertiesDialog() = default; void FilePropertiesDialog::detectTextFileSettings() { - QFile file(m_filePath.toString()); + QFile file(m_filePath.toUrlishString()); if (!file.open(QIODevice::ReadOnly)) { m_lineEndings->setText(Tr::tr("Unknown")); m_indentation->setText(Tr::tr("Unknown")); diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp index 34ebde59659..02ce780e453 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp @@ -84,7 +84,7 @@ void PromptOverwriteDialog::setFiles(const FilePaths &l) const QString nativeFileName = fileName.toUserOutput(); const int length = nativeFileName.size() - nativeCommonPath.size() - 1; QStandardItem *item = new QStandardItem(nativeFileName.right(length)); - item->setData(QVariant(fileName.toString()), FileNameRole); + item->setData(QVariant(fileName.toUrlishString()), FileNameRole); item->setFlags(Qt::ItemIsEnabled); item->setCheckable(true); item->setCheckState(Qt::Checked); diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 5a06598a383..dbbb96d74a2 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -255,7 +255,7 @@ void ReadOnlyFilesDialogPrivate::promptFailWarning(const FilePaths &files, ReadO title = Tr::tr("Could Not Change Permissions on Some Files"); message = failWarning + QLatin1Char('\n') + Tr::tr("See details for a complete list of files."); - details = Utils::transform(files, &FilePath::toString).join('\n'); + details = Utils::transform(files, &FilePath::toUrlishString).join('\n'); } QMessageBox msgBox(QMessageBox::Warning, title, message, QMessageBox::Ok, ICore::dialogParent()); diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 2d693ad7420..82400012934 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -172,7 +172,7 @@ void SaveItemsDialog::collectFilesToDiff() const QList<QTreeWidgetItem *> items = m_treeWidget->selectedItems(); for (const QTreeWidgetItem *item : items) { if (auto doc = item->data(0, Qt::UserRole).value<IDocument*>()) - m_filesToDiff.append(doc->filePath().toString()); + m_filesToDiff.append(doc->filePath().toUrlishString()); } reject(); } diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index b17468894b6..db960368e7d 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -116,7 +116,7 @@ QMap<QString, QList<QKeySequence>> CommandsFile::importCommands() const { QMap<QString, QList<QKeySequence>> result; - QFile file(m_filePath.toString()); + QFile file(m_filePath.toUrlishString()); if (!file.open(QIODevice::ReadOnly|QIODevice::Text)) return result; diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 697e68f186a..c801c200f13 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -635,7 +635,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents, for (IDocument *document : documents) { if (document && document->isModified() && !document->isTemporary()) { - QString name = document->filePath().toString(); + QString name = document->filePath().toUrlishString(); if (name.isEmpty()) name = document->fallbackSaveAsFileName(); @@ -717,7 +717,7 @@ bool DocumentManager::saveDocument(IDocument *document, if (const Result res = document->save(savePath, false); !res) { if (isReadOnly) { - QFile ofi(savePath.toString()); + QFile ofi(savePath.toUrlishString()); // Check whether the existing file is writable if (!ofi.open(QIODevice::ReadWrite) && ofi.open(QIODevice::ReadOnly)) { *isReadOnly = true; @@ -1250,7 +1250,7 @@ void DocumentManager::checkForReload() } } if (previousReloadAnswer == ReloadNoneAndDiff) - filesToDiff.append(document->filePath().toString()); + filesToDiff.append(document->filePath().toUrlishString()); // IDocument wants us to ask, and it's the TypeRemoved case } else { @@ -1259,7 +1259,7 @@ void DocumentManager::checkForReload() while (unhandled) { if (previousDeletedAnswer != FileDeletedCloseAll) { previousDeletedAnswer = - fileDeletedPrompt(document->filePath().toString(), + fileDeletedPrompt(document->filePath().toUrlishString(), ICore::dialogParent()); } switch (previousDeletedAnswer) { @@ -1370,8 +1370,8 @@ void DocumentManager::saveSettings() s->endGroup(); s->beginGroup(directoryGroupC); s->setValueWithDefault(projectDirectoryKeyC, - d->m_projectsDirectory.toString(), - PathChooser::homePath().toString()); + d->m_projectsDirectory.toUrlishString(), + PathChooser::homePath().toUrlishString()); s->setValueWithDefault(useProjectDirectoryKeyC, d->m_useProjectsDirectory, kUseProjectsDirectoryDefault); diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index dc8067f05e6..1cec44ae6cc 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -166,7 +166,7 @@ bool DocumentModelPrivate::disambiguateDisplayNames(DocumentModel::Entry *entry) .arg(++countWithoutFilePath)); continue; } - const QString uniqueDisplayName = path.relativeChildPath(commonAncestor).toString(); + const QString uniqueDisplayName = path.relativeChildPath(commonAncestor).toUrlishString(); if (uniqueDisplayName != "" && e->document->uniqueDisplayName() != uniqueDisplayName) { e->document->setUniqueDisplayName(uniqueDisplayName); } diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index c2fe46ff5f0..cf3f66f46b3 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1352,7 +1352,7 @@ EditorFactories EditorManagerPrivate::findFactories(Id editorId, const FilePath } if (factories.empty()) { qWarning("%s: unable to find an editor factory for the file '%s', editor Id '%s'.", - Q_FUNC_INFO, filePath.toString().toUtf8().constData(), editorId.name().constData()); + Q_FUNC_INFO, filePath.toUrlishString().toUtf8().constData(), editorId.name().constData()); } return factories; @@ -1604,7 +1604,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla if (!editor->document()->filePath().isEmpty() && !editor->document()->isTemporary()) { QByteArray state = editor->saveState(); if (!state.isEmpty()) - d->m_editorStates.insert(editor->document()->filePath().toString(), QVariant(state)); + d->m_editorStates.insert(editor->document()->filePath().toUrlishString(), QVariant(state)); } } @@ -1714,7 +1714,7 @@ void EditorManagerPrivate::activateView(EditorView *view) void EditorManagerPrivate::restoreEditorState(IEditor *editor) { QTC_ASSERT(editor, return); - QString fileName = editor->document()->filePath().toString(); + QString fileName = editor->document()->filePath().toUrlishString(); editor->restoreState(d->m_editorStates.value(fileName).toByteArray()); } @@ -2581,7 +2581,7 @@ void EditorManagerPrivate::revertToSaved(IDocument *document) { if (!document) return; - const QString fileName = document->filePath().toString(); + const QString fileName = document->filePath().toUrlishString(); if (fileName.isEmpty()) return; if (document->isModified()) { @@ -2651,7 +2651,7 @@ void EditorManagerPrivate::findInDirectory() return; const FilePath path = d->m_contextMenuEntry->filePath(); emit m_instance->findOnFileSystemRequest( - (path.isDir() ? path : path.parentDir()).toString()); + (path.isDir() ? path : path.parentDir()).toUrlishString()); } void EditorManagerPrivate::togglePinned() @@ -3340,7 +3340,7 @@ static QString makeTitleUnique(QString *titlePattern) QSet<QString> docnames; const QList<DocumentModel::Entry *> entries = DocumentModel::entries(); for (const DocumentModel::Entry *entry : entries) { - QString name = entry->filePath().toString(); + QString name = entry->filePath().toUrlishString(); if (name.isEmpty()) name = entry->displayName(); else @@ -3604,7 +3604,7 @@ QByteArray EditorManager::saveState() IEditor *editor = DocumentModel::editorsForDocument(document).constFirst(); QByteArray state = editor->saveState(); if (!state.isEmpty()) - d->m_editorStates.insert(document->filePath().toString(), QVariant(state)); + d->m_editorStates.insert(document->filePath().toUrlishString(), QVariant(state)); } } @@ -3622,7 +3622,7 @@ QByteArray EditorManager::saveState() for (const DocumentModel::Entry *entry : entries) { if (!entry->document->isTemporary()) { - stream << entry->filePath().toString() << entry->plainDisplayName() << entry->id() + stream << entry->filePath().toUrlishString() << entry->plainDisplayName() << entry->id() << entry->pinned; } } diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 18dd41668e7..99fff1390ab 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -1019,10 +1019,10 @@ QByteArray SplitterOrView::saveState() const stream << QByteArray("empty"); } else { if (e == EditorManager::currentEditor()) { - stream << QByteArray("currenteditor") << e->document()->filePath().toString() + stream << QByteArray("currenteditor") << e->document()->filePath().toUrlishString() << e->document()->id().toString() << e->saveState(); } else { - stream << QByteArray("editor") << e->document()->filePath().toString() + stream << QByteArray("editor") << e->document()->filePath().toUrlishString() << e->document()->id().toString() << e->saveState(); } diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp index d56b882b6c0..1cfc951ba64 100644 --- a/src/plugins/coreplugin/editormanager/systemeditor.cpp +++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp @@ -28,7 +28,7 @@ public: setEditorStarter([](const FilePath &filePath, QString *errorMessage) { Q_UNUSED(errorMessage) QUrl url; - url.setPath(filePath.toString()); + url.setPath(filePath.toUrlishString()); url.setScheme(QLatin1String("file")); if (!QDesktopServices::openUrl(url)) { if (errorMessage) diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 80bde5b67fc..6e982b45482 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -487,13 +487,13 @@ bool ExternalTool::save(QString *errorMessage) const out.writeAttribute(kError, stringForOutputHandling(m_errorHandling)); out.writeAttribute(kModifiesDocument, QLatin1String(m_modifiesCurrentDocument ? kYes : kNo)); for (const FilePath &executable : m_executables) - out.writeTextElement(kPath, executable.toString()); + out.writeTextElement(kPath, executable.toUrlishString()); if (!m_arguments.isEmpty()) out.writeTextElement(kArguments, m_arguments); if (!m_input.isEmpty()) out.writeTextElement(kInput, m_input); if (!m_workingDirectory.isEmpty()) - out.writeTextElement(kWorkingDirectory, m_workingDirectory.toString()); + out.writeTextElement(kWorkingDirectory, m_workingDirectory.toUrlishString()); if (m_baseEnvironmentProviderId.isValid()) out.writeTextElement(kBaseEnvironmentId, m_baseEnvironmentProviderId.toString()); if (!m_environment.isEmpty()) { diff --git a/src/plugins/coreplugin/externaltoolmanager.cpp b/src/plugins/coreplugin/externaltoolmanager.cpp index 41f617a3391..b7f909222e4 100644 --- a/src/plugins/coreplugin/externaltoolmanager.cpp +++ b/src/plugins/coreplugin/externaltoolmanager.cpp @@ -62,10 +62,10 @@ ExternalToolManager::ExternalToolManager() QMap<QString, QMultiMap<int, ExternalTool*> > categoryPriorityMap; QMap<QString, ExternalTool *> tools; - parseDirectory(ICore::userResourcePath("externaltools").toString(), + parseDirectory(ICore::userResourcePath("externaltools").toUrlishString(), &categoryPriorityMap, &tools); - parseDirectory(ICore::resourcePath("externaltools").toString(), + parseDirectory(ICore::resourcePath("externaltools").toUrlishString(), &categoryPriorityMap, &tools, true); diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index 527b384ba7c..0da226f4869 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -161,7 +161,7 @@ void removeFiles(const FilePaths &filePaths, bool deleteFromFS) // remove from file system for (const FilePath &fp : filePaths) { - QFile file(fp.toString()); + QFile file(fp.toUrlishString()); if (!file.exists()) // could have been deleted by vc continue; if (!file.remove()) { @@ -346,7 +346,7 @@ void updateHeaderFileGuardIfApplicable(const FilePath &oldFilePath, { if (handleGuards == HandleIncludeGuards::No) return; - const bool headerUpdateSuccess = updateHeaderFileGuardAfterRename(newFilePath.toString(), + const bool headerUpdateSuccess = updateHeaderFileGuardAfterRename(newFilePath.toUrlishString(), oldFilePath.baseName()); if (headerUpdateSuccess) return; diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp index 8afb302ee83..d6d74e37185 100644 --- a/src/plugins/coreplugin/foldernavigationwidget.cpp +++ b/src/plugins/coreplugin/foldernavigationwidget.cpp @@ -347,7 +347,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent connect(m_crumbLabel, &FileCrumbLabel::pathClicked, this, [this](const FilePath &path) { const QModelIndex rootIndex = m_sortProxyModel->mapToSource(m_listView->rootIndex()); - const QModelIndex fileIndex = m_fileSystemModel->index(path.toString()); + const QModelIndex fileIndex = m_fileSystemModel->index(path.toUrlishString()); if (!isChildOf(fileIndex, rootIndex)) selectBestRootForFile(path); selectFile(path); @@ -559,7 +559,7 @@ void FolderNavigationWidget::selectBestRootForFile(const FilePath &filePath) void FolderNavigationWidget::selectFile(const FilePath &filePath) { const QModelIndex fileIndex = m_sortProxyModel->mapFromSource( - m_fileSystemModel->index(filePath.toString())); + m_fileSystemModel->index(filePath.toUrlishString())); if (fileIndex.isValid() || filePath.isEmpty() /* Computer root */) { // TODO This only scrolls to the right position if all directory contents are loaded. // Unfortunately listening to directoryLoaded was still not enough (there might also @@ -568,7 +568,7 @@ void FolderNavigationWidget::selectFile(const FilePath &filePath) m_listView->setCurrentIndex(fileIndex); QTimer::singleShot(200, this, [this, filePath] { const QModelIndex fileIndex = m_sortProxyModel->mapFromSource( - m_fileSystemModel->index(filePath.toString())); + m_fileSystemModel->index(filePath.toUrlishString())); if (fileIndex == m_listView->rootIndex()) { m_listView->horizontalScrollBar()->setValue(0); m_listView->verticalScrollBar()->setValue(0); @@ -583,7 +583,7 @@ void FolderNavigationWidget::selectFile(const FilePath &filePath) void FolderNavigationWidget::setRootDirectory(const FilePath &directory) { const QModelIndex index = m_sortProxyModel->mapFromSource( - m_fileSystemModel->setRootPath(directory.toString())); + m_fileSystemModel->setRootPath(directory.toUrlishString())); m_listView->setRootIndex(index); } @@ -594,9 +594,9 @@ int FolderNavigationWidget::bestRootForFile(const FilePath &filePath) for (int i = 1; i < m_rootSelector->count(); ++i) { const auto root = m_rootSelector->itemData(i).value<FilePath>(); if ((filePath == root || filePath.isChildOf(root)) - && root.toString().size() > commonLength) { + && root.toUrlishString().size() > commonLength) { index = i; - commonLength = root.toString().size(); + commonLength = root.toUrlishString().size(); } } return index; @@ -625,7 +625,7 @@ void FolderNavigationWidget::createNewFolder(const QModelIndex &parent) existingItems); // create directory and edit const QModelIndex index = m_sortProxyModel->mapFromSource( - m_fileSystemModel->mkdir(parent, name.toString())); + m_fileSystemModel->mkdir(parent, name.toUrlishString())); if (!index.isValid()) return; m_listView->setCurrentIndex(index); @@ -634,7 +634,7 @@ void FolderNavigationWidget::createNewFolder(const QModelIndex &parent) void FolderNavigationWidget::setCrumblePath(const FilePath &filePath) { - const QModelIndex index = m_fileSystemModel->index(filePath.toString()); + const QModelIndex index = m_fileSystemModel->index(filePath.toUrlishString()); const int width = m_crumbLabel->width(); const int previousHeight = m_crumbLabel->immediateHeightForWidth(width); m_crumbLabel->setPath(filePath); diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 3938bd9861a..399e97b20cd 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -247,7 +247,7 @@ void GeneralSettingsWidget::fillLanguageBox() const int end = name.lastIndexOf('.'); const QString locale = name.mid(start, end - start); // no need to show a language that creator will not load anyway - if (hasQmFilesForLocale(locale, creatorTrPath.toString())) { + if (hasQmFilesForLocale(locale, creatorTrPath.toUrlishString())) { QLocale tmpLocale(locale); const auto languageItem = QString("%1 (%2) - %3 (%4)") .arg( diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 2ebb4fbbefd..9809bb48864 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -2169,7 +2169,7 @@ IDocument *ICore::openFiles(const FilePaths &filePaths, emFlags |= EditorManager::SwitchSplitIfAlreadyVisible; IEditor *editor = nullptr; if (flags & ICore::CanContainLineAndColumnNumbers) { - const Link &link = Link::fromString(absoluteFilePath.toString(), true); + const Link &link = Link::fromString(absoluteFilePath.toUrlishString(), true); editor = EditorManager::openEditorAt(link, {}, emFlags); } else { editor = EditorManager::openEditor(absoluteFilePath, {}, emFlags); diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 32c0465a30d..7d79fa6bfb2 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -677,7 +677,7 @@ void IDocument::setRestoredFrom(const Utils::FilePath &path) void IDocument::removeAutoSaveFile() { if (!d->autoSavePath.isEmpty()) { - QFile::remove(d->autoSavePath.toString()); + QFile::remove(d->autoSavePath.toUrlishString()); d->autoSavePath.clear(); if (d->restored) { d->restored = false; diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp index 0b3407e33f3..77014c5f014 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.cpp +++ b/src/plugins/coreplugin/locator/directoryfilter.cpp @@ -108,14 +108,14 @@ void DirectoryFilter::saveState(QJsonObject &object) const if (!m_directories.isEmpty()) { object.insert(kDirectoriesKey, QJsonArray::fromStringList( - Utils::transform(m_directories, &FilePath::toString))); + Utils::transform(m_directories, &FilePath::toUrlishString))); } if (m_filters != kFiltersDefault) object.insert(kFiltersKey, QJsonArray::fromStringList(m_filters)); const std::optional<FilePaths> files = m_cache.filePaths(); if (files) { object.insert(kFilesKey, QJsonArray::fromStringList( - Utils::transform(*files, &FilePath::toString))); + Utils::transform(*files, &FilePath::toUrlishString))); } if (m_exclusionFilters != kExclusionFiltersDefault) object.insert(kExclusionFiltersKey, QJsonArray::fromStringList(m_exclusionFilters)); @@ -266,7 +266,7 @@ bool DirectoryFilter::openConfigDialog(QWidget *parent, bool &needsRefresh) &DirectoryFilter::updateOptionButtons, Qt::DirectConnection); m_dialog->directoryList->clear(); - m_dialog->directoryList->addItems(Utils::transform(m_directories, &FilePath::toString)); + m_dialog->directoryList->addItems(Utils::transform(m_directories, &FilePath::toUrlishString)); m_dialog->nameLabel->setVisible(m_isCustomFilter); m_dialog->nameEdit->setVisible(m_isCustomFilter); m_dialog->directoryLabel->setVisible(m_isCustomFilter); diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index cc7b423a78c..faab4214a7b 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp @@ -200,7 +200,7 @@ static void matches(QPromise<void> &promise, const LocatorStorage &storage, } // file names can match with +linenumber or :linenumber const Link link = Link::fromString(entryFileName, true); - regExp = ILocatorFilter::createRegExp(link.targetFilePath.toString(), caseSensitivity); + regExp = ILocatorFilter::createRegExp(link.targetFilePath.toUrlishString(), caseSensitivity); if (regExp.isValid()) { for (const FilePath &file : files) { if (promise.isCanceled()) diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp index ee5e88451e7..2903d2cff78 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp @@ -1094,7 +1094,7 @@ LocatorFilterEntries LocatorFileCachePrivate::generate(const QFuture<void> &futu // If search string contains spaces, treat them as wildcard '*' and search in full path const QString wildcardInput = QDir::fromNativeSeparators(input).replace(' ', '*'); const Link inputLink = Link::fromString(wildcardInput, true); - const QString newInput = inputLink.targetFilePath.toString(); + const QString newInput = inputLink.targetFilePath.toUrlishString(); const QRegularExpression regExp = ILocatorFilter::createRegExp(newInput); if (!regExp.isValid()) return {}; // Don't clear the cache - still remember the cache for the last valid input. @@ -1313,7 +1313,7 @@ FilePaths LocatorFileCache::processFilePaths(const QFuture<void> &future, if (future.isCanceled()) return {}; - const QString matchText = hasPathSeparator ? path.toString() : path.fileName(); + const QString matchText = hasPathSeparator ? path.toUrlishString() : path.fileName(); const QRegularExpressionMatch match = regExp.match(matchText); if (match.hasMatch()) { diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp index b080894fcb2..defc86bddee 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp @@ -38,7 +38,7 @@ static void matchEditors(QPromise<void> &promise, const LocatorStorage &storage, const QList<Entry> &editorsData) { const Link link = Link::fromString(storage.input(), true); - const QRegularExpression regexp = ILocatorFilter::createRegExp(link.targetFilePath.toString()); + const QRegularExpression regexp = ILocatorFilter::createRegExp(link.targetFilePath.toUrlishString()); if (!regexp.isValid()) return; diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index 78fdf895fcf..49e0b4238f8 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -123,7 +123,7 @@ static void matches(QPromise<void> &promise, // If search string contains spaces, treat them as wildcard '*' and search in full path const QString wildcardInput = QDir::fromNativeSeparators(storage.input()).replace(' ', '*'); const Link inputLink = Link::fromString(wildcardInput, true); - const QString newInput = inputLink.targetFilePath.toString(); + const QString newInput = inputLink.targetFilePath.toUrlishString(); const QRegularExpression regExp = ILocatorFilter::createRegExp(newInput); if (!regExp.isValid()) return; @@ -189,7 +189,7 @@ LocatorMatcherTasks SpotlightLocatorFilter::matchers() // only pass the file name part to allow searches like "somepath/*foo" const std::unique_ptr<MacroExpander> expander(createMacroExpander(input.fileName())); - const QString args = caseSensitivity(input.toString()) == Qt::CaseInsensitive + const QString args = caseSensitivity(input.toUrlishString()) == Qt::CaseInsensitive ? insensArgs : sensArgs; const CommandLine cmd(FilePath::fromString(command), expander->expand(args), CommandLine::Raw); @@ -228,7 +228,7 @@ bool SpotlightLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefres chooser->addSupportedWidget(caseSensitiveArgumentsEdit); const bool accepted = ILocatorFilter::openConfigDialog(parent, &configWidget); if (accepted) { - m_command = commandEdit->unexpandedFilePath().toString(); + m_command = commandEdit->unexpandedFilePath().toUrlishString(); m_arguments = argumentsEdit->text(); m_caseSensitiveArguments = caseSensitiveArgumentsEdit->text(); m_sortResults = sortResults->isChecked(); diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 10dced06d63..9cd4e663160 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -601,9 +601,9 @@ void MimeTypeSettingsPage::writeUserModifiedMimeTypes() { static Utils::FilePath modifiedMimeTypesFile = ICore::userResourcePath(kModifiedMimeTypesFile); - if (QFileInfo::exists(modifiedMimeTypesFile.toString()) - || QDir().mkpath(modifiedMimeTypesFile.parentDir().toString())) { - QFile file(modifiedMimeTypesFile.toString()); + if (QFileInfo::exists(modifiedMimeTypesFile.toUrlishString()) + || QDir().mkpath(modifiedMimeTypesFile.parentDir().toUrlishString())) { + QFile file(modifiedMimeTypesFile.toUrlishString()); if (file.open(QFile::WriteOnly | QFile::Truncate)) { // Notice this file only represents user modifications. It is writen in a // convienient way for synchronization, which is similar to but not exactly the @@ -662,7 +662,7 @@ MimeTypeSettingsPage::UserMimeTypeHash MimeTypeSettingsPage::readUserModifiedMim { static Utils::FilePath modifiedMimeTypesPath = ICore::userResourcePath(kModifiedMimeTypesFile); UserMimeTypeHash userMimeTypes; - QFile file(modifiedMimeTypesPath.toString()); + QFile file(modifiedMimeTypesPath.toUrlishString()); if (file.open(QFile::ReadOnly)) { UserMimeType mt; QXmlStreamReader reader(&file); diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index bb430f1929f..448c73e8a4e 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -100,7 +100,7 @@ public: bool isComplete() const final { const FilePath path = m_data->sourcePath; - if (!QFileInfo::exists(path.toString())) { + if (!QFileInfo::exists(path.toUrlishString())) { m_info->setText(Tr::tr("File does not exist.")); return false; } diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp index e1c76ca7cb5..583fe3e6d6c 100644 --- a/src/plugins/coreplugin/themechooser.cpp +++ b/src/plugins/coreplugin/themechooser.cpp @@ -171,7 +171,7 @@ QList<ThemeEntry> ThemeEntry::availableThemes() static const FilePath installThemeDir = ICore::resourcePath("themes"); static const FilePath userThemeDir = ICore::userResourcePath("themes"); - addThemesFromPath(installThemeDir.toString(), &themes); + addThemesFromPath(installThemeDir.toUrlishString(), &themes); if (themes.isEmpty()) qWarning() << "Warning: No themes found in installation: " << installThemeDir.toUserOutput(); @@ -182,7 +182,7 @@ QList<ThemeEntry> ThemeEntry::availableThemes() ThemeEntry defaultEntry = themes.takeAt(defaultIndex); themes.prepend(defaultEntry); } - addThemesFromPath(userThemeDir.toString(), &themes); + addThemesFromPath(userThemeDir.toUrlishString(), &themes); return themes; } diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 14271eab44f..14a206754cd 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -78,12 +78,12 @@ public: { QTC_ASSERT(dir.isAbsolutePath(), return); - const QString topLevelString = topLevel.toString(); + const QString topLevelString = topLevel.toUrlishString(); QTC_ASSERT(dir.isChildOf(topLevel) || topLevel == dir || topLevel.isEmpty(), return); QTC_ASSERT((topLevel.isEmpty() && !vc) || (!topLevel.isEmpty() && vc), return); FilePath tmpDir = dir; - while (tmpDir.toString().size() >= topLevelString.size() && !tmpDir.isEmpty()) { + while (tmpDir.toUrlishString().size() >= topLevelString.size() && !tmpDir.isEmpty()) { m_cachedMatches.insert(tmpDir, {vc, topLevel}); // if no vc was found, this might mean we're inside a repo internal directory (.git) // Cache only input directory, not parents @@ -171,7 +171,7 @@ void VcsManager::resetVersionControlForDirectory(const FilePath &inputDirectory) static FilePath fixedDir(const FilePath &directory) { #ifdef WITH_TESTS - const QString directoryString = directory.toString(); + const QString directoryString = directory.toUrlishString(); if (!directoryString.isEmpty() && directoryString[0].isLetter() && directoryString.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1) { return FilePath::fromString(directoryString.mid(2)); @@ -283,7 +283,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const FilePath &inpu // we need to select the version control with the longest toplevel pathname. Utils::sort(allThatCanManage, [](const FilePathVersionControlPair &l, const FilePathVersionControlPair &r) { - return l.first.toString().size() > r.first.toString().size(); + return l.first.toUrlishString().size() > r.first.toUrlishString().size(); }); if (allThatCanManage.isEmpty()) { @@ -308,9 +308,9 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const FilePath &inpu // In this case, don't cache it. if (!tmpDir.isEmpty()) { for (auto i = allThatCanManage.constBegin(); i != allThatCanManage.constEnd(); ++i) { - const QString firstString = i->first.toString(); + const QString firstString = i->first.toUrlishString(); // If topLevel was already cached for another VC, skip this one - if (tmpDir.toString().size() < firstString.size()) + if (tmpDir.toUrlishString().size() < firstString.size()) continue; d->cache(i->second, i->first, tmpDir); tmpDir = i->first.parentDir(); @@ -761,7 +761,7 @@ void VcsManagerTest::testVcsManager() FilePath realTopLevel; vcs = VcsManager::findVersionControlForDirectory( FilePath::fromString(makeString(directory)), &realTopLevel); - QCOMPARE(realTopLevel.toString(), makeString(topLevel)); + QCOMPARE(realTopLevel.toUrlishString(), makeString(topLevel)); if (vcs) QCOMPARE(vcs->id().toString(), vcsId); else diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 299bbba23d1..2f3c4561960 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -373,7 +373,7 @@ void CodePasterPluginPrivate::finishFetch(const QString &titleDescription, return; } const Utils::FilePath filePath = saver.filePath(); - m_fetchedSnippets.push_back(filePath.toString()); + m_fetchedSnippets.push_back(filePath.toUrlishString()); // Open editor with title. IEditor *editor = EditorManager::openEditor(filePath); QTC_ASSERT(editor, return); diff --git a/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp b/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp index e2bc8434fb6..39452f172f3 100644 --- a/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp +++ b/src/plugins/cppcheck/cppcheckdiagnosticsmodel.cpp @@ -106,7 +106,7 @@ void DiagnosticsModel::add(const Diagnostic &diagnostic) if (m_diagnostics.size() == 1) emit hasDataChanged(true); - const QString filePath = diagnostic.fileName.toString(); + const QString filePath = diagnostic.fileName.toUrlishString(); FilePathItem *&filePathItem = m_filePathToItem[filePath]; if (!filePathItem) { filePathItem = new FilePathItem(filePath); diff --git a/src/plugins/cppcheck/cppcheckrunner.cpp b/src/plugins/cppcheck/cppcheckrunner.cpp index bcf663e46e2..1d0f44da413 100644 --- a/src/plugins/cppcheck/cppcheckrunner.cpp +++ b/src/plugins/cppcheck/cppcheckrunner.cpp @@ -119,11 +119,11 @@ void CppcheckRunner::checkQueued() m_currentFiles.clear(); int argumentsLength = commandLine.arguments().length(); while (!files.isEmpty()) { - argumentsLength += files.first().toString().size() + 3; // +1 for separator +2 for quotes + argumentsLength += files.first().toUrlishString().size() + 3; // +1 for separator +2 for quotes if (argumentsLength >= m_maxArgumentsLength) break; m_currentFiles.push_back(files.first()); - commandLine.addArg(files.first().toString()); + commandLine.addArg(files.first().toUrlishString()); files.pop_front(); } diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp index e91e5a2ca05..02c87260850 100644 --- a/src/plugins/cppcheck/cppchecktool.cpp +++ b/src/plugins/cppcheck/cppchecktool.cpp @@ -108,7 +108,7 @@ QStringList CppcheckTool::additionalArguments(const CppEditor::ProjectPart &part if (settings().addIncludePaths()) { for (const ProjectExplorer::HeaderPath &path : part.headerPaths) { - const QString projectDir = m_project->projectDirectory().toString(); + const QString projectDir = m_project->projectDirectory().toUrlishString(); if (path.type == ProjectExplorer::HeaderPathType::User && path.path.startsWith(projectDir)) result.push_back("-I " + path.path); @@ -167,7 +167,7 @@ void CppcheckTool::check(const Utils::FilePaths &files) } else { std::copy_if(files.cbegin(), files.cend(), std::back_inserter(filtered), [this](const Utils::FilePath &file) { - const QString stringed = file.toString(); + const QString stringed = file.toUrlishString(); const auto filter = [stringed](const QRegularExpression &re) { return re.match(stringed).hasMatch(); }; diff --git a/src/plugins/cppeditor/abstracteditorsupport.cpp b/src/plugins/cppeditor/abstracteditorsupport.cpp index a61146ee87e..d0e0ca60a11 100644 --- a/src/plugins/cppeditor/abstracteditorsupport.cpp +++ b/src/plugins/cppeditor/abstracteditorsupport.cpp @@ -35,7 +35,7 @@ void AbstractEditorSupport::updateDocument() void AbstractEditorSupport::notifyAboutUpdatedContents() const { CppModelManager::emitAbstractEditorSupportContentsUpdated( - filePath().toString(), sourceFilePath().toString(), contents()); + filePath().toUrlishString(), sourceFilePath().toUrlishString(), contents()); } QString AbstractEditorSupport::licenseTemplate(ProjectExplorer::Project *project, diff --git a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp index e2c600681dd..5a6eb709bdd 100644 --- a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp +++ b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp @@ -75,7 +75,7 @@ void BaseEditorDocumentProcessor::runParser(QPromise<void> &promise, } parser->update(promise, updateParams); - CppModelManager::finishedRefreshingSourceFiles({parser->filePath().toString()}); + CppModelManager::finishedRefreshingSourceFiles({parser->filePath().toUrlishString()}); promise.setProgressValue(1); } diff --git a/src/plugins/cppeditor/builtineditordocumentparser.cpp b/src/plugins/cppeditor/builtineditordocumentparser.cpp index 627e36d3b3d..be70051662a 100644 --- a/src/plugins/cppeditor/builtineditordocumentparser.cpp +++ b/src/plugins/cppeditor/builtineditordocumentparser.cpp @@ -66,7 +66,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QPromise<void> &promise, QString projectConfigFile; LanguageFeatures features = LanguageFeatures::defaultFeatures(); - baseState.projectPartInfo = determineProjectPart(filePath().toString(), + baseState.projectPartInfo = determineProjectPart(filePath().toUrlishString(), baseConfig.preferredProjectPartId, baseState.projectPartInfo, updateParams.activeProject, @@ -206,7 +206,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QPromise<void> &promise, for (Snapshot::const_iterator i = state.snapshot.begin(), ei = state.snapshot.end(); i != ei; ++i) { - if (Client::isInjectedFile(i.key().toString())) + if (Client::isInjectedFile(i.key().toUrlishString())) newSnapshot.insert(i.value()); } state.snapshot = newSnapshot; diff --git a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp index 33f415fe6be..039fd30521d 100644 --- a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp +++ b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp @@ -327,7 +327,7 @@ SemanticInfo::Source BuiltinEditorDocumentProcessor::createSemanticInfoSource(bo source = entry->first; revision = entry->second; } - return SemanticInfo::Source(filePath().toString(), source, revision, m_documentSnapshot, force); + return SemanticInfo::Source(filePath().toUrlishString(), source, revision, m_documentSnapshot, force); } } // namespace CppEditor diff --git a/src/plugins/cppeditor/clangdsettings.cpp b/src/plugins/cppeditor/clangdsettings.cpp index 036dbeb41c3..ee4b15111a2 100644 --- a/src/plugins/cppeditor/clangdsettings.cpp +++ b/src/plugins/cppeditor/clangdsettings.cpp @@ -467,7 +467,7 @@ Store ClangdSettings::Data::toMap() const map.insert(useClangdKey(), useClangd); map.insert(clangdPathKey(), - executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString() + executableFilePath != fallbackClangdFilePath() ? executableFilePath.toUrlishString() : QString()); map.insert(clangdIndexingKey(), indexingPriority != IndexingPriority::Off); diff --git a/src/plugins/cppeditor/compilationdb.cpp b/src/plugins/cppeditor/compilationdb.cpp index bdfab8d9009..cedb7bf1ff9 100644 --- a/src/plugins/cppeditor/compilationdb.cpp +++ b/src/plugins/cppeditor/compilationdb.cpp @@ -21,7 +21,7 @@ namespace CppEditor { static QStringList projectPartArguments(const ProjectPart &projectPart) { QStringList args; - args << projectPart.compilerFilePath.toString(); + args << projectPart.compilerFilePath.toUrlishString(); args << "-c"; if (projectPart.toolchainType != PEConstants::MSVC_TOOLCHAIN_TYPEID) { args << "--target=" + projectPart.toolchainTargetTriple; @@ -110,7 +110,7 @@ static QJsonObject createFileObject(const FilePath &buildDir, bool clStyle) { QJsonObject fileObject; - fileObject["file"] = projFile.path.toString(); + fileObject["file"] = projFile.path.toUrlishString(); QJsonArray args; if (purpose == CompilationDbPurpose::Project) { @@ -142,7 +142,7 @@ static QJsonObject createFileObject(const FilePath &buildDir, args.append(projFile.path.toUserOutput()); fileObject["arguments"] = args; - fileObject["directory"] = buildDir.toString(); + fileObject["directory"] = buildDir.toUrlishString(); return fileObject; } diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp index 62f1c564746..417cce92748 100644 --- a/src/plugins/cppeditor/compileroptionsbuilder.cpp +++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp @@ -321,7 +321,7 @@ void CompilerOptionsBuilder::insertWrappedMingwHeaders() static QString creatorResourcePath() { #ifndef UNIT_TESTS - return Core::ICore::resourcePath().toString(); + return Core::ICore::resourcePath().toUrlishString(); #else return QDir::toNativeSeparators(QString::fromUtf8(QTC_RESOURCE_DIR "")); #endif diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp index 8944a52e7da..0de93b834c3 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp @@ -199,7 +199,7 @@ void BuiltinModelManagerSupport::checkUnused(const Utils::Link &link, SearchResu const Utils::LinkHandler &callback) { CPlusPlus::Snapshot snapshot = CppModelManager::snapshot(); - QFile file(link.targetFilePath.toString()); + QFile file(link.targetFilePath.toUrlishString()); if (!file.open(QIODevice::ReadOnly)) return callback(link); const QByteArray &contents = file.readAll(); diff --git a/src/plugins/cppeditor/cppcodegen_test.cpp b/src/plugins/cppeditor/cppcodegen_test.cpp index b48ffa77bad..761d1ed3fb1 100644 --- a/src/plugins/cppeditor/cppcodegen_test.cpp +++ b/src/plugins/cppeditor/cppcodegen_test.cpp @@ -46,7 +46,7 @@ Document::Ptr createDocumentAndFile(TemporaryDir *temporaryDir, const FilePath absoluteFilePath = temporaryDir->createFile(relativeFilePath, text); QTC_ASSERT(!absoluteFilePath.isEmpty(), return Document::Ptr()); - return createDocument(absoluteFilePath.toString(), text, expectedGlobalSymbolCount); + return createDocument(absoluteFilePath.toUrlishString(), text, expectedGlobalSymbolCount); } } // anonymous namespace diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index badad82f691..f5388697f11 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -1239,7 +1239,7 @@ QVariant WorkingCopyModel::data(const QModelIndex &index, int role) const if (column == RevisionColumn) return m_workingCopyList.at(row).revision; else if (column == FilePathColumn) - return m_workingCopyList.at(row).filePath.toString(); + return m_workingCopyList.at(row).filePath.toUrlishString(); } else if (role == Qt::UserRole) { return m_workingCopyList.at(row).source; } @@ -1965,7 +1965,7 @@ void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Const {QString::fromLatin1("ToolChain Type"), part->toolchainType.toString()}, {QString::fromLatin1("ToolChain Target Triple"), part->toolchainTargetTriple}, {QString::fromLatin1("ToolChain Word Width"), CMI::Utils::toString(part->toolchainAbi.wordWidth())}, - {QString::fromLatin1("ToolChain Install Dir"), part->toolchainInstallDir.toString()}, + {QString::fromLatin1("ToolChain Install Dir"), part->toolchainInstallDir.toUrlishString()}, {QString::fromLatin1("Language Version"), CMI::Utils::toString(part->languageVersion)}, {QString::fromLatin1("Language Extensions"), CMI::Utils::toString(part->languageExtensions)}, {QString::fromLatin1("Qt Version"), CMI::Utils::toString(part->qtVersion)} diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp index 8c604693e79..35c2904f5e9 100644 --- a/src/plugins/cppeditor/cppdoxygen_test.cpp +++ b/src/plugins/cppeditor/cppdoxygen_test.cpp @@ -485,7 +485,7 @@ void DoxygenTest::runTest(const QByteArray &original, } // Update Code Model - QVERIFY(TestCase::parseFiles(testDocument.filePath().toString())); + QVERIFY(TestCase::parseFiles(testDocument.filePath().toUrlishString())); // Open Editor QVERIFY(TestCase::openCppEditor(testDocument.filePath(), &testDocument.m_editor, diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index bb2b3c56dc1..a9ab3954c7b 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -48,7 +48,7 @@ class CppEditorDocumentHandleImpl : public CppEditorDocumentHandle public: CppEditorDocumentHandleImpl(CppEditorDocument *cppEditorDocument) : m_cppEditorDocument(cppEditorDocument) - , m_registrationFilePath(cppEditorDocument->filePath().toString()) + , m_registrationFilePath(cppEditorDocument->filePath().toUrlishString()) { CppModelManager::registerCppEditorDocument(this); } @@ -218,7 +218,7 @@ void CppEditorDocument::reparseWithPreferredParseContext(const QString &parseCon setPreferredParseContext(parseContextId); // Remember the setting - const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toString()); + const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toUrlishString()); Core::SessionManager::setValue(key, parseContextId); // Reprocess @@ -285,7 +285,7 @@ void CppEditorDocument::applyPreferredParseContextFromSettings() if (filePath().isEmpty()) return; - const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toString()); + const Key key = Constants::PREFERRED_PARSE_CONTEXT + keyFromString(filePath().toUrlishString()); const QString parseContextId = Core::SessionManager::value(key).toString(); setPreferredParseContext(parseContextId); @@ -296,7 +296,7 @@ void CppEditorDocument::applyExtraPreprocessorDirectivesFromSettings() if (filePath().isEmpty()) return; - const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(filePath().toString()); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(filePath().toUrlishString()); const QByteArray directives = Core::SessionManager::value(key).toString().toUtf8(); setExtraPreprocessorDirectives(directives); diff --git a/src/plugins/cppeditor/cppfileiterationorder.cpp b/src/plugins/cppeditor/cppfileiterationorder.cpp index 38dcb088b09..3b861bdb442 100644 --- a/src/plugins/cppeditor/cppfileiterationorder.cpp +++ b/src/plugins/cppeditor/cppfileiterationorder.cpp @@ -125,7 +125,7 @@ QStringList FileIterationOrder::toStringList() const QStringList result; for (const auto &entry : m_set) - result.append(entry.filePath.toString()); + result.append(entry.filePath.toUrlishString()); return result; } diff --git a/src/plugins/cppeditor/cppheadersource.cpp b/src/plugins/cppeditor/cppheadersource.cpp index 0c586a4082e..153a8db44b1 100644 --- a/src/plugins/cppeditor/cppheadersource.cpp +++ b/src/plugins/cppeditor/cppheadersource.cpp @@ -155,7 +155,7 @@ static FilePath correspondingHeaderOrSourceInProject(const FilePath &filePath, FilePath bestFilePath; int compareValue = 0; for (const FilePath &projectFile : projectFiles) { - int value = commonFilePathLength(filePath.toString(), projectFile.toString()); + int value = commonFilePathLength(filePath.toUrlishString(), projectFile.toUrlishString()); if (value > compareValue) { compareValue = value; bestFilePath = projectFile; @@ -274,7 +274,7 @@ static inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, b static void createTempFile(const FilePath &filePath) { - QString fileName = filePath.toString(); + QString fileName = filePath.toUrlishString(); QFile file(fileName); QDir(QFileInfo(fileName).absolutePath()).mkpath(_(".")); file.open(QFile::WriteOnly); diff --git a/src/plugins/cppeditor/cppindexingsupport.cpp b/src/plugins/cppeditor/cppindexingsupport.cpp index 73e3fafff32..a7acfc54b08 100644 --- a/src/plugins/cppeditor/cppindexingsupport.cpp +++ b/src/plugins/cppeditor/cppindexingsupport.cpp @@ -75,7 +75,7 @@ public: void process(const CPlusPlus::Document::Ptr document) { using namespace CPlusPlus; - const QString fileName = document->filePath().toString(); + const QString fileName = document->filePath().toUrlishString(); const QList<Document::DiagnosticMessage> messages = document->diagnosticMessages(); for (const Document::DiagnosticMessage &message : messages) { diff --git a/src/plugins/cppeditor/cpplocatordata.cpp b/src/plugins/cppeditor/cpplocatordata.cpp index a0899b0ddde..076fb4b5d74 100644 --- a/src/plugins/cppeditor/cpplocatordata.cpp +++ b/src/plugins/cppeditor/cpplocatordata.cpp @@ -88,7 +88,7 @@ void CppLocatorData::flushPendingDocument(bool force) const return; for (CPlusPlus::Document::Ptr doc : std::as_const(m_pendingDocuments)) - m_infosByFile.insert(StringTable::insert(doc->filePath().toString()), m_search(doc)); + m_infosByFile.insert(StringTable::insert(doc->filePath().toUrlishString()), m_search(doc)); m_pendingDocuments.clear(); m_pendingDocuments.reserve(MaxPendingDocuments); diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 6b67a5f9755..0e9f344ed1e 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -424,7 +424,7 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit) } const Toolchain * tc = nullptr; - const ProjectFile classifier(filePath, ProjectFile::classify(filePath.toString())); + const ProjectFile classifier(filePath, ProjectFile::classify(filePath.toUrlishString())); if (classifier.isC()) { tc = ToolchainKitAspect::cToolchain(project->activeTarget()->kit()); } else if (classifier.isCxx() || classifier.isHeader()) { @@ -1180,7 +1180,7 @@ CppEditorDocumentHandle *CppModelManager::cppEditorDocument(const FilePath &file return nullptr; QMutexLocker locker(&d->m_cppEditorDocumentsMutex); - return d->m_cppEditorDocuments.value(filePath.toString(), 0); + return d->m_cppEditorDocuments.value(filePath.toUrlishString(), 0); } BaseEditorDocumentProcessor *CppModelManager::cppEditorDocumentProcessor(const FilePath &filePath) @@ -1196,8 +1196,8 @@ void CppModelManager::registerCppEditorDocument(CppEditorDocumentHandle *editorD QTC_ASSERT(!filePath.isEmpty(), return); QMutexLocker locker(&d->m_cppEditorDocumentsMutex); - QTC_ASSERT(d->m_cppEditorDocuments.value(filePath.toString(), 0) == 0, return); - d->m_cppEditorDocuments.insert(filePath.toString(), editorDocument); + QTC_ASSERT(d->m_cppEditorDocuments.value(filePath.toUrlishString(), 0) == 0, return); + d->m_cppEditorDocuments.insert(filePath.toUrlishString(), editorDocument); } void CppModelManager::unregisterCppEditorDocument(const QString &filePath) @@ -1340,7 +1340,7 @@ static QSet<QString> filteredFilesRemoved(const QSet<QString> &files, } if (!skip) - result << filePath.toString(); + result << filePath.toUrlishString(); } return result; @@ -1354,7 +1354,7 @@ QFuture<void> CppModelManager::updateSourceFiles(const QSet<FilePath> &sourceFil std::unordered_map<Project *, QSet<QString>> sourcesPerProject; for (const FilePath &fp : sourceFiles) - sourcesPerProject[ProjectManager::projectForFile(fp)] << fp.toString(); + sourcesPerProject[ProjectManager::projectForFile(fp)] << fp.toUrlishString(); std::vector<std::pair<QSet<QString>, CppCodeModelSettings>> sourcesAndSettings; for (const auto &it : sourcesPerProject) { sourcesAndSettings @@ -1401,10 +1401,10 @@ void CppModelManager::removeProjectInfoFilesAndIncludesFromSnapshot(const Projec const QSet<FilePath> filePaths = d->m_snapshot.allIncludesForDocument(cxxFile.path); for (const FilePath &filePath : filePaths) { d->m_snapshot.remove(filePath); - removedFiles << filePath.toString(); + removedFiles << filePath.toUrlishString(); } d->m_snapshot.remove(cxxFile.path); - removedFiles << cxxFile.path.toString(); + removedFiles << cxxFile.path.toUrlishString(); } } @@ -1619,7 +1619,7 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo::ConstPtr &ne const QSet<FilePath> removedFiles = comparer.removedFiles(); if (!removedFiles.isEmpty()) { filesRemoved = true; - emit m_instance->aboutToRemoveFiles(transform<QStringList>(removedFiles, &FilePath::toString)); + emit m_instance->aboutToRemoveFiles(transform<QStringList>(removedFiles, &FilePath::toUrlishString)); removeFilesFromSnapshot(removedFiles); } } @@ -1991,10 +1991,10 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>> const QTextBlock &block = file->document()->findBlockByNumber( candidate.includeLine - 1); const FilePath relPathOld = FilePath::fromString(FilePath::calcRelativePath( - candidate.oldHeaderFilePath.toString(), includingFileOld.parentDir().toString())); + candidate.oldHeaderFilePath.toUrlishString(), includingFileOld.parentDir().toUrlishString())); const FilePath relPathNew = FilePath::fromString(FilePath::calcRelativePath( - candidate.newHeaderFilePath.toString(), includingFileNew.parentDir().toString())); - int replaceStart = block.text().indexOf(relPathOld.toString()); + candidate.newHeaderFilePath.toUrlishString(), includingFileNew.parentDir().toUrlishString())); + int replaceStart = block.text().indexOf(relPathOld.toUrlishString()); QString oldString; QString newString; if (candidate.isUiHeader || replaceStart == -1) { @@ -2002,8 +2002,8 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>> oldString = candidate.oldHeaderFileName; newString = candidate.newHeaderFileName; } else { - oldString = relPathOld.toString(); - newString = relPathNew.toString(); + oldString = relPathOld.toUrlishString(); + newString = relPathNew.toUrlishString(); } if (replaceStart > -1 && oldString != newString) { changeSet.replace(block.position() + replaceStart, @@ -2175,7 +2175,7 @@ void CppModelManager::GC() if (reachableFiles.contains(fileName)) newSnapshot.insert(it.value()); else - notReachableFiles.append(fileName.toString()); + notReachableFiles.append(fileName.toUrlishString()); } // Announce removing files and replace the snapshot diff --git a/src/plugins/cppeditor/cppmodelmanager_test.cpp b/src/plugins/cppeditor/cppmodelmanager_test.cpp index 9df81945a6c..f0da12542ea 100644 --- a/src/plugins/cppeditor/cppmodelmanager_test.cpp +++ b/src/plugins/cppeditor/cppmodelmanager_test.cpp @@ -109,7 +109,7 @@ public: rpp.setQtVersion(Utils::QtMajorVersion::Qt5); const ProjectFiles rppFiles = Utils::transform<ProjectFiles>(projectFiles, [](const FilePath &file) { - return ProjectFile(file, ProjectFile::classify(file.toString())); + return ProjectFile(file, ProjectFile::classify(file.toUrlishString())); }); const auto project = modelManagerTestHelper->createProject( name, Utils::FilePath::fromString(dir).pathAppended(name + ".pro")); @@ -606,11 +606,11 @@ void ModelManagerTest::testExtraeditorsupportUiFiles() QStringList fileNamesInWorkinCopy; const WorkingCopy::Table &elements = workingCopy.elements(); for (auto it = elements.cbegin(), end = elements.cend(); it != end; ++it) - fileNamesInWorkinCopy << Utils::FilePath::fromString(it.key().toString()).fileName(); + fileNamesInWorkinCopy << Utils::FilePath::fromString(it.key().toUrlishString()).fileName(); fileNamesInWorkinCopy.sort(); const QString expectedUiHeaderFileName = _("ui_mainwindow.h"); - QCOMPARE(fileNamesInWorkinCopy.at(0), CppModelManager::configurationFileName().toString()); + QCOMPARE(fileNamesInWorkinCopy.at(0), CppModelManager::configurationFileName().toUrlishString()); QCOMPARE(fileNamesInWorkinCopy.at(1), expectedUiHeaderFileName); // Check CppSourceProcessor / includes. @@ -795,7 +795,7 @@ void ModelManagerTest::testPrecompiledHeaders() RawProjectPart rpp1; rpp1.setProjectFileLocation("project1.projectfile"); rpp1.setQtVersion(Utils::QtMajorVersion::None); - rpp1.setPreCompiledHeaders({pch1File.toString()}); + rpp1.setPreCompiledHeaders({pch1File.toUrlishString()}); rpp1.setHeaderPaths({HeaderPath::makeUser(testDataDirectory.includeDir(false))}); const auto part1 = ProjectPart::create(project->projectFilePath(), rpp1, {}, {{main1File, ProjectFile::CXXSource}, {header, ProjectFile::CXXHeader}}); @@ -803,7 +803,7 @@ void ModelManagerTest::testPrecompiledHeaders() RawProjectPart rpp2; rpp2.setProjectFileLocation("project2.projectfile"); rpp2.setQtVersion(Utils::QtMajorVersion::None); - rpp2.setPreCompiledHeaders({pch2File.toString()}); + rpp2.setPreCompiledHeaders({pch2File.toUrlishString()}); rpp2.setHeaderPaths({HeaderPath::makeUser(testDataDirectory.includeDir(false))}); const auto part2 = ProjectPart::create(project->projectFilePath(), rpp2, {}, {{main2File, ProjectFile::CXXSource}, {header, ProjectFile::CXXHeader}}); @@ -1306,14 +1306,14 @@ void ModelManagerTest::testSettingsChanges() = Utils::transform({"baz.h", "baz2.h", "baz3.h", "foo.cpp", "foo.h", "main.cpp"}, [&](const QString &fn) { return p1Dir.filePath(fn); }); const ProjectFiles p1ProjectFiles = Utils::transform(p1Files, [](const FilePath &fp) { - return ProjectFile(fp, ProjectFile::classify(fp.toString())); + return ProjectFile(fp, ProjectFile::classify(fp.toUrlishString())); }); Project * const p1 = helper.createProject("testdata_project1", FilePath::fromString("p1.pro")); setupProjectNodes(*p1, p1ProjectFiles); RawProjectPart rpp1; const auto part1 = ProjectPart::create(p1->projectFilePath(), rpp1, {}, p1ProjectFiles); const auto pi1 = ProjectInfo::create(ProjectUpdateInfo(p1, KitInfo(nullptr), {}, {}), {part1}); - const auto p1Sources = Utils::transform<QSet<QString>>(p1Files, &FilePath::toString); + const auto p1Sources = Utils::transform<QSet<QString>>(p1Files, &FilePath::toUrlishString); CppModelManager::updateProjectInfo(pi1); const MyTestDataDir p2Dir("testdata_project2"); @@ -1321,14 +1321,14 @@ void ModelManagerTest::testSettingsChanges() = Utils::transform({"bar.h", "bar.cpp", "foobar2000.h", "foobar4000.h", "main.cpp"}, [&](const QString &fn) { return p1Dir.filePath(fn); }); const ProjectFiles p2ProjectFiles = Utils::transform(p2Files, [](const FilePath &fp) { - return ProjectFile(fp, ProjectFile::classify(fp.toString())); + return ProjectFile(fp, ProjectFile::classify(fp.toUrlishString())); }); Project * const p2 = helper.createProject("testdata_project2", FilePath::fromString("p2.pro")); setupProjectNodes(*p2, p2ProjectFiles); RawProjectPart rpp2; const auto part2 = ProjectPart::create(p2->projectFilePath(), rpp2, {}, p2ProjectFiles); const auto pi2 = ProjectInfo::create(ProjectUpdateInfo(p2, KitInfo(nullptr), {}, {}), {part2}); - const auto p2Sources = Utils::transform<QSet<QString>>(p2Files, &FilePath::toString); + const auto p2Sources = Utils::transform<QSet<QString>>(p2Files, &FilePath::toUrlishString); CppModelManager::updateProjectInfo(pi2); // Initial check: Have all files been indexed? @@ -1368,7 +1368,7 @@ void ModelManagerTest::testSettingsChanges() QVERIFY(waitForRefresh()); QVERIFY(!waitForRefresh()); QSet<QString> filteredP1Sources = p1Sources; - filteredP1Sources -= p1Dir.filePath("baz3.h").toString(); + filteredP1Sources -= p1Dir.filePath("baz3.h").toUrlishString(); QCOMPARE(refreshedFiles, filteredP1Sources); } diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index a7a39750e95..145fb1f0d70 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -26,7 +26,7 @@ CppPreProcessorDialog::CppPreProcessorDialog(const FilePath &filePath, QWidget * resize(400, 300); setWindowTitle(Tr::tr("Additional C++ Preprocessor Directives")); - const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toString()); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toUrlishString()); const QString directives = Core::SessionManager::value(key).toString(); m_editWidget = new TextEditor::SnippetEditorWidget; @@ -55,7 +55,7 @@ int CppPreProcessorDialog::exec() if (QDialog::exec() == Rejected) return Rejected; - const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toString()); + const Key key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + keyFromString(m_filePath.toUrlishString()); Core::SessionManager::setValue(key, extraPreprocessorDirectives()); return Accepted; diff --git a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp index f9e13df0825..ee0e9c7ad68 100644 --- a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp +++ b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp @@ -83,7 +83,7 @@ static std::optional<SemanticInfo> canReuseSemanticInfo( && currentSemanticInfo.revision == source.revision && currentSemanticInfo.doc && currentSemanticInfo.doc->translationUnit()->ast() - && currentSemanticInfo.doc->filePath().toString() == source.fileName + && currentSemanticInfo.doc->filePath().toUrlishString() == source.fileName && !currentSemanticInfo.snapshot.isEmpty() && currentSemanticInfo.snapshot == source.snapshot) { SemanticInfo newSemanticInfo; diff --git a/src/plugins/cppeditor/cppsourceprocessor.cpp b/src/plugins/cppeditor/cppsourceprocessor.cpp index f55971ad521..2f31a7797ff 100644 --- a/src/plugins/cppeditor/cppsourceprocessor.cpp +++ b/src/plugins/cppeditor/cppsourceprocessor.cpp @@ -198,7 +198,7 @@ bool CppSourceProcessor::getFileContents(const FilePath &absoluteFilePath, contents, &error) != Utils::TextFileFormat::ReadSuccess) { - qWarning("Error reading file \"%s\": \"%s\".", qPrintable(absoluteFilePath.toString()), + qWarning("Error reading file \"%s\": \"%s\".", qPrintable(absoluteFilePath.toUrlishString()), qPrintable(error)); return false; } @@ -401,7 +401,7 @@ void CppSourceProcessor::sourceNeeded(int line, const FilePath &filePath, Includ const FilePath absoluteFilePath = resolveFile(filePath, type); if (m_currentDoc) { - m_currentDoc->addIncludeFile(Document::Include(filePath.toString(), absoluteFilePath, line, type)); + m_currentDoc->addIncludeFile(Document::Include(filePath.toUrlishString(), absoluteFilePath, line, type)); if (absoluteFilePath.isEmpty()) { m_currentDoc->addDiagnosticMessage(messageNoSuchFile(m_currentDoc, filePath, line)); return; @@ -430,14 +430,14 @@ void CppSourceProcessor::sourceNeeded(int line, const FilePath &filePath, Includ return; } - qCDebug(log) << "Parsing:" << absoluteFilePath.toString() << "contents:" << contents.size() << "bytes"; + qCDebug(log) << "Parsing:" << absoluteFilePath.toUrlishString() << "contents:" << contents.size() << "bytes"; Document::Ptr document = Document::create(absoluteFilePath); document->setEditorRevision(editorRevision); document->setLanguageFeatures(m_languageFeatures); for (const FilePath &include : initialIncludes) { m_included.insert(include); - Document::Include inc(include.toString(), include, 0, IncludeLocal); + Document::Include inc(include.toUrlishString(), include, 0, IncludeLocal); document->addIncludeFile(inc); } if (absoluteFilePath.exists()) @@ -457,7 +457,7 @@ void CppSourceProcessor::sourceNeeded(int line, const FilePath &filePath, Includ switchCurrentDocument(previousDocument); mergeEnvironment(globalDocument); m_snapshot.insert(globalDocument); - m_todo.remove(absoluteFilePath.toString()); + m_todo.remove(absoluteFilePath.toUrlishString()); return; } @@ -471,7 +471,7 @@ void CppSourceProcessor::sourceNeeded(int line, const FilePath &filePath, Includ m_documentFinished(document); m_snapshot.insert(document); - m_todo.remove(absoluteFilePath.toString()); + m_todo.remove(absoluteFilePath.toUrlishString()); switchCurrentDocument(previousDocument); } diff --git a/src/plugins/cppeditor/cpptoolsjsextension.cpp b/src/plugins/cppeditor/cpptoolsjsextension.cpp index c3ed6e6286e..5715d20c212 100644 --- a/src/plugins/cppeditor/cpptoolsjsextension.cpp +++ b/src/plugins/cppeditor/cpptoolsjsextension.cpp @@ -37,7 +37,7 @@ static CppFileSettings fileSettings() static QString fileName(const QString &path, const QString &extension) { - return Utils::FilePath::fromStringWithExtension(path, extension).toString(); + return Utils::FilePath::fromStringWithExtension(path, extension).toUrlishString(); } QString CppToolsJsExtension::headerGuard(const QString &in) const diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp index 6f9ecfa267c..4e49981c7a7 100644 --- a/src/plugins/cppeditor/cpptoolstestcase.cpp +++ b/src/plugins/cppeditor/cpptoolstestcase.cpp @@ -192,7 +192,7 @@ static bool snapshotContains(const CPlusPlus::Snapshot &snapshot, const QSet<Fil { for (const FilePath &filePath : filePaths) { if (!snapshot.contains(filePath)) { - qWarning() << "Missing file in snapshot:" << qPrintable(filePath.toString()); + qWarning() << "Missing file in snapshot:" << qPrintable(filePath.toUrlishString()); return false; } } diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 3d19a84b758..149843f28cd 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -254,7 +254,7 @@ F2TestCase::F2TestCase(CppEditorAction action, testFile->setBaseDirectory(temporaryDir.path()); QVERIFY(testFile->writeToDisk()); projectFileContent += QString::fromLatin1("\"%1\",") - .arg(testFile->filePath().toString()); + .arg(testFile->filePath().toFSPathString()); } projectFileContent += "]}\n"; diff --git a/src/plugins/cppeditor/generatedcodemodelsupport.cpp b/src/plugins/cppeditor/generatedcodemodelsupport.cpp index 63c9de66b91..87490a84344 100644 --- a/src/plugins/cppeditor/generatedcodemodelsupport.cpp +++ b/src/plugins/cppeditor/generatedcodemodelsupport.cpp @@ -66,7 +66,7 @@ GeneratedCodeModelSupport::GeneratedCodeModelSupport(ExtraCompiler *generator, GeneratedCodeModelSupport::~GeneratedCodeModelSupport() { - CppModelManager::emitAbstractEditorSupportRemoved(m_generatedFilePath.toString()); + CppModelManager::emitAbstractEditorSupportRemoved(m_generatedFilePath.toUrlishString()); QLoggingCategory log("qtc.cppeditor.generatedcodemodelsupport", QtWarningMsg); qCDebug(log) << "dtor ~generatedcodemodelsupport for" << m_generatedFilePath; } diff --git a/src/plugins/cppeditor/projectinfo_test.cpp b/src/plugins/cppeditor/projectinfo_test.cpp index f1035dd7fa0..bbd174f9fd1 100644 --- a/src/plugins/cppeditor/projectinfo_test.cpp +++ b/src/plugins/cppeditor/projectinfo_test.cpp @@ -115,7 +115,7 @@ void ProjectPartChooserTest::testChooseManuallySet() rpp2.setProjectFileLocation("someId"); ProjectPart::ConstPtr p2 = ProjectPart::create({}, rpp2); ProjectPartChooserTestHelper t; - t.preferredProjectPartId = p2->projectFile.toString(); + t.preferredProjectPartId = p2->projectFile.toUrlishString(); t.projectPartsForFile += {p1, p2}; QCOMPARE(t.choose().projectPart, p2); @@ -128,7 +128,7 @@ void ProjectPartChooserTest::testIndicateManuallySet() rpp2.setProjectFileLocation("someId"); ProjectPart::ConstPtr p2 = ProjectPart::create({}, rpp2); ProjectPartChooserTestHelper t; - t.preferredProjectPartId = p2->projectFile.toString(); + t.preferredProjectPartId = p2->projectFile.toUrlishString(); t.projectPartsForFile += {p1, p2}; QVERIFY(t.choose().hints & ProjectPartInfo::IsPreferredMatch); @@ -141,7 +141,7 @@ void ProjectPartChooserTest::testIndicateManuallySetForFallbackToProjectPartFrom rpp2.setProjectFileLocation("someId"); ProjectPart::ConstPtr p2 = ProjectPart::create({}, rpp2); ProjectPartChooserTestHelper t; - t.preferredProjectPartId = p2->projectFile.toString(); + t.preferredProjectPartId = p2->projectFile.toUrlishString(); t.projectPartsFromDependenciesForFile += {p1, p2}; QVERIFY(t.choose().hints & ProjectPartInfo::IsPreferredMatch); diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp index 5aed4f19acc..4df6f1fc6dc 100644 --- a/src/plugins/cppeditor/projectpart.cpp +++ b/src/plugins/cppeditor/projectpart.cpp @@ -27,7 +27,7 @@ QString ProjectPart::id() const QString ProjectPart::projectFileLocation() const { - QString location = projectFile.toString(); + QString location = projectFile.toUrlishString(); if (projectFileLine > 0) location += ":" + QString::number(projectFileLine); if (projectFileColumn > 0) diff --git a/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp index c745ebdffef..93707466639 100644 --- a/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp +++ b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp @@ -348,7 +348,7 @@ private: return; QString className; - const QString currentDocumentFilePath = interface.semanticInfo().doc->filePath().toString(); + const QString currentDocumentFilePath = interface.semanticInfo().doc->filePath().toUrlishString(); const HeaderPaths headerPaths = relevantHeaderPaths(currentDocumentFilePath); FilePaths headers; @@ -370,7 +370,7 @@ private: for (const FilePath &header : std::as_const(headerAndItsForwardingHeaders)) { const QString include = findShortestInclude(currentDocumentFilePath, - header.toString(), + header.toUrlishString(), headerPaths); if (include.size() > 2) { const QString headerFileName = info->filePath().fileName(); diff --git a/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp index 03131034331..8ab139f0054 100644 --- a/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp @@ -113,13 +113,13 @@ bool CppQuickFixProjectsSettings::useCustomSettings() msgBox.setText(Tr::tr("Quick Fix settings are saved in a file. Existing settings file " "\"%1\" found. Should this file be used or a " "new one be created?") - .arg(m_settingsFile.toString())); + .arg(m_settingsFile.toUrlishString())); QPushButton *cancel = msgBox.addButton(QMessageBox::Cancel); cancel->setToolTip(Tr::tr("Switch Back to Global Settings")); QPushButton *useExisting = msgBox.addButton(Tr::tr("Use Existing"), QMessageBox::AcceptRole); - useExisting->setToolTip(m_settingsFile.toString()); + useExisting->setToolTip(m_settingsFile.toUrlishString()); QPushButton *createNew = msgBox.addButton(Tr::tr("Create New"), QMessageBox::ActionRole); - createNew->setToolTip(defaultLocation.toString()); + createNew->setToolTip(defaultLocation.toUrlishString()); msgBox.exec(); if (msgBox.clickedButton() == createNew) { m_settingsFile = defaultLocation; @@ -148,7 +148,7 @@ bool CppQuickFixProjectsSettings::saveOwnSettings() if (m_settingsFile.isEmpty()) return false; - QtcSettings settings(m_settingsFile.toString(), QSettings::IniFormat); + QtcSettings settings(m_settingsFile.toUrlishString(), QSettings::IniFormat); if (settings.status() == QSettings::NoError) { m_ownSettings.saveSettingsTo(&settings); settings.sync(); @@ -160,7 +160,7 @@ bool CppQuickFixProjectsSettings::saveOwnSettings() void CppQuickFixProjectsSettings::loadOwnSettingsFromFile() { - QtcSettings settings(m_settingsFile.toString(), QSettings::IniFormat); + QtcSettings settings(m_settingsFile.toUrlishString(), QSettings::IniFormat); if (settings.status() == QSettings::NoError) { m_ownSettings.loadSettingsFrom(&settings); return; diff --git a/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp index 8046d80a601..ec654ec637a 100644 --- a/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp @@ -95,7 +95,7 @@ void CppQuickFixProjectSettingsWidget::buttonCustomClicked() { if (useGlobalSettings()) { // delete file - QFile::remove(m_projectSettings->filePathOfSettingsFile().toString()); + QFile::remove(m_projectSettings->filePathOfSettingsFile().toUrlishString()); m_pushButton->setVisible(false); } else /*Custom*/ { m_projectSettings->resetOwnSettingsToGlobal(); diff --git a/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp index 204014dfebf..b0eda5e33c0 100644 --- a/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp +++ b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp @@ -354,7 +354,7 @@ private: return; CppRefactoringChanges refactoring(snapshot()); - const bool isHeaderFile = ProjectFile::isHeader(ProjectFile::classify(filePath().toString())); + const bool isHeaderFile = ProjectFile::isHeader(ProjectFile::classify(filePath().toUrlishString())); FilePath cppFile; // Only set if the class is defined in a header file. if (isHeaderFile) { InsertionPointLocator locator(refactoring); @@ -521,7 +521,7 @@ private: // Insert Position: Implementation File DeclaratorAST *declAST = simpleDecl->declarator_list->value; InsertDefOperation *op = nullptr; - ProjectFile::Kind kind = ProjectFile::classify(interface.filePath().toString()); + ProjectFile::Kind kind = ProjectFile::classify(interface.filePath().toUrlishString()); const bool isHeaderFile = ProjectFile::isHeader(kind); if (isHeaderFile) { CppRefactoringChanges refactoring(interface.snapshot()); diff --git a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp index ada2027971e..a9c409bc55b 100644 --- a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp +++ b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp @@ -412,7 +412,7 @@ private: ChangeSet changes; if (isDeclFile) { QString relInclude = headerFilePath.relativePathFrom( - refactoringFile->filePath().parentDir()).toString(); + refactoringFile->filePath().parentDir()).toUrlishString(); if (!relInclude.isEmpty()) relInclude.append('/'); relInclude.append('"').append(headerFileName).append('"'); diff --git a/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp b/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp index f889b14121a..d13c39bd201 100644 --- a/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp +++ b/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp @@ -438,9 +438,9 @@ private: } } else { for (auto i = s.begin(); i != s.end(); ++i) { - if (ProjectFile::classify(i.key().toString()) != ProjectFile::Unsupported) { + if (ProjectFile::classify(i.key().toUrlishString()) != ProjectFile::Unsupported) { handleFile(i.key(), i.value(), [](const FilePath &file) { - return ProjectFile::classify(file.toString()) != ProjectFile::Unsupported; + return ProjectFile::classify(file.toUrlishString()) != ProjectFile::Unsupported; }); } } @@ -577,7 +577,7 @@ private: UsingDirectiveAST *usingDirective = path.at(n)->asUsingDirective(); if (usingDirective && usingDirective->name->name->asNameId()) { result << new RemoveUsingNamespaceOperation(interface, usingDirective, false); - const bool isHeader = ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toString())); + const bool isHeader = ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toUrlishString())); if (isHeader && path.at(n - 1)->asTranslationUnit()) // using namespace at global scope result << new RemoveUsingNamespaceOperation(interface, usingDirective, true); } diff --git a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp index 0c5c43e83a8..53c8b2fb31d 100644 --- a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp +++ b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp @@ -129,7 +129,7 @@ static QString findResourceInProject(const QString &resName) const QFileInfo fi = file.toFileInfo(); if (!fi.isReadable()) continue; - const QString fileName = findResourceInFile(s, file.toString()); + const QString fileName = findResourceInFile(s, file.toUrlishString()); if (fileName.isEmpty()) continue; diff --git a/src/plugins/cppeditor/searchsymbols.cpp b/src/plugins/cppeditor/searchsymbols.cpp index 324364b699f..23cf97d2e6e 100644 --- a/src/plugins/cppeditor/searchsymbols.cpp +++ b/src/plugins/cppeditor/searchsymbols.cpp @@ -39,7 +39,7 @@ void SearchSymbols::setSymbolsToSearchFor(const SymbolTypes &types) IndexItem::Ptr SearchSymbols::operator()(Document::Ptr doc, const QString &scope) { - IndexItem::Ptr root = IndexItem::create(StringTable::insert(doc->filePath().toString()), 100); + IndexItem::Ptr root = IndexItem::create(StringTable::insert(doc->filePath().toUrlishString()), 100); { // RAII scope ScopedIndexItemPtr parentRaii(_parent, root); @@ -48,7 +48,7 @@ IndexItem::Ptr SearchSymbols::operator()(Document::Ptr doc, const QString &scope QTC_ASSERT(_parent, return IndexItem::Ptr()); QTC_ASSERT(root, return IndexItem::Ptr()); - QTC_ASSERT(_parent->filePath().toString() == StringTable::insert(doc->filePath().toString()), + QTC_ASSERT(_parent->filePath().toUrlishString() == StringTable::insert(doc->filePath().toUrlishString()), return IndexItem::Ptr()); for (int i = 0, ei = doc->globalSymbolCount(); i != ei; ++i) diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index c72d3b04b1c..0b41d3854ed 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -659,7 +659,7 @@ CvsPluginPrivate::CvsPluginPrivate() void CvsPluginPrivate::vcsDescribe(const FilePath &source, const QString &changeNr) { QString errorMessage; - if (!describe(source.toString(), changeNr, &errorMessage)) + if (!describe(source.toUrlishString(), changeNr, &errorMessage)) VcsOutputWindow::appendError(errorMessage); }; @@ -773,7 +773,7 @@ void CvsPluginPrivate::revertAll() if (!messageBoxQuestion(title, Tr::tr("Revert all pending changes to the repository?"))) return; const auto revertResponse = runCvs(state.topLevel(), {"update", "-C", - state.topLevel().toString()}, RunFlags::ShowStdOut); + state.topLevel().toUrlishString()}, RunFlags::ShowStdOut); if (revertResponse.result() != ProcessResult::FinishedWithSuccess) { Core::AsynchronousMessageBox::warning(title, Tr::tr("Revert failed: %1") .arg(revertResponse.exitMessage())); @@ -808,7 +808,7 @@ void CvsPluginPrivate::revertCurrentFile() const auto revertRes = runCvs(state.currentFileTopLevel(), {"update", "-C", state.relativeCurrentFile()}, RunFlags::ShowStdOut); if (revertRes.result() == ProcessResult::FinishedWithSuccess) - emit filesChanged(QStringList(state.currentFile().toString())); + emit filesChanged(QStringList(state.currentFile().toUrlishString())); } void CvsPluginPrivate::diffProject() @@ -898,7 +898,7 @@ void CvsPluginPrivate::startCommit(const FilePath &workingDir, const QString &fi VcsOutputWindow::appendError(saver.errorString()); return; } - m_commitMessageFileName = saver.filePath().toString(); + m_commitMessageFileName = saver.filePath().toUrlishString(); // Create a submit editor and set file list CvsSubmitEditor *editor = openCVSSubmitEditor(m_commitMessageFileName); setSubmitEditor(editor); @@ -1162,7 +1162,7 @@ bool CvsPluginPrivate::describe(const QString &file, const QString &changeNr, QS .arg(QDir::toNativeSeparators(file)); return false; } - return describe(toplevel, QDir(toplevel.toString()).relativeFilePath(file), changeNr, errorMessage); + return describe(toplevel, QDir(toplevel.toUrlishString()).relativeFilePath(file), changeNr, errorMessage); } bool CvsPluginPrivate::describe(const FilePath &toplevel, const QString &file, @@ -1339,7 +1339,7 @@ bool CvsPluginPrivate::managesDirectory(const FilePath &directory, FilePath *top if (topLevel) topLevel->clear(); bool manages = false; - const QDir dir(directory.toString()); + const QDir dir(directory.toUrlishString()); do { if (!dir.exists() || !checkCVSDirectory(dir)) break; diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 8c40907aa93..1f85e919e14 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1901,7 +1901,7 @@ FilePath BreakpointItem::markerFileName() const if (origFileName.endsWith(m_parameters.fileName.fileName())) return origFileName; - return m_parameters.fileName.toString().size() > origFileName.toString().size() + return m_parameters.fileName.toUrlishString().size() > origFileName.toUrlishString().size() ? m_parameters.fileName : origFileName; } diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp index 3f29c2a2a09..8fed0ad7be7 100644 --- a/src/plugins/debugger/breakpoint.cpp +++ b/src/plugins/debugger/breakpoint.cpp @@ -136,7 +136,7 @@ bool BreakpointParameters::isQmlFileAndLineBreakpoint() const qmlExtensionString = ".qml;.js;.mjs"; const auto qmlFileExtensions = qmlExtensionString.split(';', Qt::SkipEmptyParts); - const QString file = fileName.toString(); + const QString file = fileName.toUrlishString(); for (const QString &extension : qmlFileExtensions) { if (file.endsWith(extension, Qt::CaseInsensitive)) return true; diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index c905055e731..6c1907941fd 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -2466,7 +2466,7 @@ unsigned BreakpointCorrectionContext::fixLineNumber(const FilePath &filePath, } if (debug) qDebug("Code model: Breakpoint line %u -> %u in %s", - lineNumber, correctedLine, qPrintable(filePath.toString())); + lineNumber, correctedLine, qPrintable(filePath.toUrlishString())); return correctedLine; } @@ -2654,7 +2654,7 @@ unsigned CdbEngine::parseStackTrace(const GdbMi &data, bool sourceStepInto) return ParseStackStepOut; } if (hasFile) { - const NormalizedSourceFileName fileName = sourceMapNormalizeFileNameFromDebugger(frames.at(i).file.toString()); + const NormalizedSourceFileName fileName = sourceMapNormalizeFileNameFromDebugger(frames.at(i).file.toUrlishString()); if (!fileName.exists && i == 0 && sourceStepInto) { showMessage("Step into: Hit frame with no source, step out...", LogMisc); return ParseStackStepOut; diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp index 5d40d3e72de..fd4119e361c 100644 --- a/src/plugins/debugger/dap/dapengine.cpp +++ b/src/plugins/debugger/dap/dapengine.cpp @@ -814,7 +814,7 @@ void DapEngine::handleBreakpointResponse(const QJsonObject &response) const Breakpoints bps = breakHandler()->breakpoints(); for (const Breakpoint &bp : bps) { BreakpointParameters parameters = bp->requestedParameters(); - QString mapKey = parameters.fileName.toString() + ":" + QString mapKey = parameters.fileName.toUrlishString() + ":" + QString::number(parameters.textPosition.line); if (map.find(mapKey) != map.end()) { if (bp->state() == BreakpointRemoveProceeding) { @@ -854,14 +854,14 @@ void DapEngine::handleBreakpointResponse(const QJsonObject &response) if (!bp->isEnabled()) continue; - QString path = bp->requestedParameters().fileName.toString(); + QString path = bp->requestedParameters().fileName.toUrlishString(); int line = bp->requestedParameters().textPosition.line; QJsonObject jsonBreakpoint; QString key; for (auto it = map.cbegin(); it != map.cend(); ++it) { const QJsonObject breakpoint = *it; - if (path == bp->requestedParameters().fileName.toString() + if (path == bp->requestedParameters().fileName.toUrlishString() && abs(breakpoint.value("line").toInt() - line) < abs(jsonBreakpoint.value("line").toInt() - line)) { jsonBreakpoint = breakpoint; diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 4f72ee6611b..03f4b5e22fa 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -246,7 +246,7 @@ Result DebuggerRunParameters::fixupParameters(ProjectExplorer::RunControl *runCo if (debugInfoLocation.isEmpty()) debugInfoLocation = sysRoot / "/usr/lib/debug"; if (debugSourceLocation.isEmpty()) { - const QString base = sysRoot.toString() + "/usr/src/debug/"; + const QString base = sysRoot.toUrlishString() + "/usr/src/debug/"; debugSourceLocation.append(base + "qt5base/src/corelib"); debugSourceLocation.append(base + "qt5base/src/gui"); debugSourceLocation.append(base + "qt5base/src/network"); @@ -1852,7 +1852,7 @@ void DebuggerEnginePrivate::cleanupViews() bool keepIt = true; if (document->isModified()) keepIt = true; - else if (document->filePath().toString().contains("qeventdispatcher")) + else if (document->filePath().toUrlishString().contains("qeventdispatcher")) keepIt = false; else if (isMemory) keepIt = !closeMemory; @@ -3037,7 +3037,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp) rp.symbolFile = rp.symbolFile.stringAppended(".exe"); QString errorMessage; QStringList rc; - if (getPDBFiles(rp.symbolFile.toString(), &rc, &errorMessage) && !rc.isEmpty()) + if (getPDBFiles(rp.symbolFile.toUrlishString(), &rc, &errorMessage) && !rc.isEmpty()) return; if (!errorMessage.isEmpty()) { detailedWarning.append('\n'); @@ -3064,7 +3064,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp) const ElfData elfData = reader.readHeaders(); const QString error = reader.errorString(); - showMessage("EXAMINING " + rp.symbolFile.toString(), LogDebug); + showMessage("EXAMINING " + rp.symbolFile.toUrlishString(), LogDebug); QByteArray msg = "ELF SECTIONS: "; static const QList<QByteArray> interesting = { diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 62f5319c18e..92bbcd30843 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -811,7 +811,7 @@ void DebuggerItemModel::autoDetectUvscDebuggers() QString errorMsg; const QString uVisionVersion = winGetDLLVersion( - WinDLLFileVersion, uVision.toString(), &errorMsg); + WinDLLFileVersion, uVision.toUrlishString(), &errorMsg); DebuggerItem item; item.createId(); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 426b06a86de..c224633fe43 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1620,7 +1620,7 @@ void DebuggerPluginPrivate::attachToLastCore() auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); runControl->setKit(KitManager::defaultKit()); - runControl->setDisplayName(Tr::tr("Last Core file \"%1\"").arg(lastCore.coreFile.toString())); + runControl->setDisplayName(Tr::tr("Last Core file \"%1\"").arg(lastCore.coreFile.toUrlishString())); auto debugger = new DebuggerRunTool(runControl); DebuggerRunParameters &rp = debugger->runParameters(); @@ -2277,7 +2277,7 @@ void DebuggerPlugin::attachToProcess(const qint64 processId, const Utils::FilePa { ProcessInfo processInfo; processInfo.processId = processId; - processInfo.executable = executable.toString(); + processInfo.executable = executable.toUrlishString(); auto kitChooser = new KitChooser; kitChooser->setShowIcons(true); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index f0fe64aabab..5de6e7a6780 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -726,7 +726,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm void DebuggerRunTool::addSolibSearchDir(const QString &str) { QString path = str; - path.replace("%{sysroot}", m_runParameters.sysRoot.toString()); + path.replace("%{sysroot}", m_runParameters.sysRoot.toUrlishString()); m_runParameters.solibSearchPath.append(FilePath::fromString(path)); } diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 8f5d6a92aea..9d516dd585c 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -142,7 +142,7 @@ SourcePathMap SourcePathMappingModel::sourcePathMap() const for (int r = 0; r < rows; ++r) { const Mapping m = mappingAt(r); // Skip placeholders. if (!m.first.isEmpty() && !m.second.isEmpty()) - rc.insert(m.first.toString(), m.second.toString()); + rc.insert(m.first.toUrlishString(), m.second.toUrlishString()); } return rc; } @@ -154,10 +154,10 @@ bool SourcePathMappingModel::isNewPlaceHolder(const Mapping &m) const const QChar greaterThan('>'); return m.first.isEmpty() || m.first.startsWith(lessThan) || m.first.endsWith(greaterThan) - || m.first.toString() == m_newSourcePlaceHolder + || m.first.toUrlishString() == m_newSourcePlaceHolder || m.second.isEmpty() || m.second.startsWith(lessThan) || m.second.endsWith(greaterThan) - || m.second.toString() == m_newTargetPlaceHolder; + || m.second.toUrlishString() == m_newTargetPlaceHolder; } // Return raw, unfixed mapping @@ -310,7 +310,7 @@ QString DebuggerSourcePathMappingWidget::editSourceField() const QString DebuggerSourcePathMappingWidget::editTargetField() const { - return m_targetChooser->unexpandedFilePath().toString(); + return m_targetChooser->unexpandedFilePath().toUrlishString(); } void DebuggerSourcePathMappingWidget::setEditFieldMapping(const Mapping &m) @@ -385,7 +385,7 @@ void DebuggerSourcePathMappingWidget::slotAddQt() if (qtSourcesPath.isEmpty()) return; for (const QString &buildPath : qtBuildPaths()) - m_model->addMapping(buildPath, qtSourcesPath.toString()); + m_model->addMapping(buildPath, qtSourcesPath.toUrlishString()); resizeColumns(); setCurrentRow(m_model->rowCount() - 1); } diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 08ffe94ac68..7fee69987b6 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -892,7 +892,7 @@ void DebuggerToolTipManagerPrivate::slotTooltipOverrideRequested QString raw = cppExpressionAt(editorWidget, context.position, &context.line, &context.column, &context.function, &context.scopeFromLine, &context.scopeToLine); context.expression = fixCppExpression(raw); - context.isCppEditor = CppEditor::ProjectFile::classify(document->filePath().toString()) + context.isCppEditor = CppEditor::ProjectFile::classify(document->filePath().toUrlishString()) != CppEditor::ProjectFile::Unsupported; if (context.expression.isEmpty()) { diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index b176ec14df1..2254aa6d5b1 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -83,7 +83,7 @@ bool FrameKey::matches(const Location &loc) const { return loc.address() >= startAddress && loc.address() <= endAddress - && loc.fileName().toString() == fileName + && loc.fileName().toUrlishString() == fileName && loc.functionName() == functionName; } @@ -273,7 +273,7 @@ void DisassemblerAgent::setContents(const DisassemblerLines &contents) const quint64 endAddress = contents.endAddress(); if (startAddress) { FrameKey key; - key.fileName = d->location.fileName().toString(); + key.fileName = d->location.fileName().toUrlishString(); key.functionName = d->location.functionName(); key.startAddress = startAddress; key.endAddress = endAddress; @@ -303,7 +303,7 @@ void DisassemblerAgent::setContentsToDocument(const DisassemblerLines &contents) // Make that a proper TextDocument reimplementation. d->document->setProperty(Debugger::Constants::OPENED_BY_DEBUGGER, true); d->document->setProperty(Debugger::Constants::OPENED_WITH_DISASSEMBLY, true); - d->document->setProperty(Debugger::Constants::DISASSEMBLER_SOURCE_FILE, d->location.fileName().toString()); + d->document->setProperty(Debugger::Constants::DISASSEMBLER_SOURCE_FILE, d->location.fileName().toUrlishString()); d->configureMimeType(); } else { EditorManager::activateEditorForDocument(d->document); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index cf91965e153..aa2907318c6 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2256,7 +2256,7 @@ void GdbEngine::handleBreakInsert1(const DebuggerResponse &response, const Break } else if (response.data["msg"].data().contains("Unknown option")) { // Older version of gdb don't know the -a option to set tracepoints // ^error,msg="mi_cmd_break_insert: Unknown option ``a''" - const QString fileName = bp->fileName().toString(); + const QString fileName = bp->fileName().toUrlishString(); const int lineNumber = bp->textPosition().line; DebuggerCommand cmd("trace \"" + GdbMi::escapeCString(fileName) + "\":" + QString::number(lineNumber), @@ -2778,7 +2778,7 @@ void GdbEngine::removeBreakpoint(const Breakpoint &bp) // We already have a fully inserted breakpoint. notifyBreakpointRemoveProceeding(bp); showMessage( - QString("DELETING BP %1 IN %2").arg(bp->responseId()).arg(bp->fileName().toString())); + QString("DELETING BP %1 IN %2").arg(bp->responseId()).arg(bp->fileName().toUrlishString())); DebuggerCommand cmd("-break-delete " + bp->responseId(), NeedsTemporaryStop); runCommand(cmd); diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index e3c46807e98..49c89dff833 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -259,7 +259,7 @@ void LldbEngine::handleLldbStarted() } for (const FilePath &path : rp.solibSearchPath) - executeDebuggerCommand("settings append target.exec-search-paths " + path.toString()); + executeDebuggerCommand("settings append target.exec-search-paths " + path.toUrlishString()); const FilePath &executable = rp.inferior().command.executable(); DebuggerCommand cmd2("setupInferior"); @@ -308,7 +308,7 @@ void LldbEngine::handleLldbStarted() && (rp.startMode() == AttachToRemoteProcess || rp.startMode() == AttachToLocalProcess || rp.startMode() == AttachToRemoteServer || rp.startMode() == AttachToIosDevice)); cmd2.arg("attachpid", rp.attachPid().pid()); - cmd2.arg("sysroot", rp.deviceSymbolsRoot.isEmpty() ? rp.sysRoot.toString() + cmd2.arg("sysroot", rp.deviceSymbolsRoot.isEmpty() ? rp.sysRoot.toUrlishString() : rp.deviceSymbolsRoot); cmd2.arg("remotechannel", ((rp.startMode() == AttachToRemoteProcess || rp.startMode() == AttachToRemoteServer) diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index bf56c71da38..3e64e2649ee 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -175,7 +175,7 @@ bool ModulesModel::contextMenuEvent(const ItemViewEvent &ev) moduleNameValid && modulePath.isLocal() && modulePath.exists() && dependsCanBeFound(), [modulePath] { - Process::startDetached({{"depends"}, {modulePath.toString()}}); + Process::startDetached({{"depends"}, {modulePath.toUrlishString()}}); }); addAction(this, menu, Tr::tr("Load Symbols for All Modules"), diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 8ab09b67f73..53df51f9492 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -96,7 +96,7 @@ void PdbEngine::setupEngine() QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); m_interpreter = runParameters().interpreter; - QString bridge = ICore::resourcePath("debugger/pdbbridge.py").toString(); + QString bridge = ICore::resourcePath("debugger/pdbbridge.py").toUrlishString(); connect(&m_proc, &Process::started, this, &PdbEngine::handlePdbStarted); connect(&m_proc, &Process::done, this, &PdbEngine::handlePdbDone); @@ -227,7 +227,7 @@ void PdbEngine::insertBreakpoint(const Breakpoint &bp) if (params.type == BreakpointByFunction) loc = params.functionName; else - loc = params.fileName.toString() + ':' + QString::number(params.textPosition.line); + loc = params.fileName.toUrlishString() + ':' + QString::number(params.textPosition.line); postDirectCommand("break " + loc); } diff --git a/src/plugins/debugger/peripheralregisterhandler.cpp b/src/plugins/debugger/peripheralregisterhandler.cpp index 413074cc0d5..e1c66febe33 100644 --- a/src/plugins/debugger/peripheralregisterhandler.cpp +++ b/src/plugins/debugger/peripheralregisterhandler.cpp @@ -592,7 +592,7 @@ static void handleGroup(QXmlStreamReader &in, PeripheralRegisterGroups &groups) static PeripheralRegisterGroups availablePeripheralRegisterGroups(const FilePath &filePath) { - QFile f(filePath.toString()); + QFile f(filePath.toUrlishString()); if (!f.open(QIODevice::ReadOnly)) return {}; diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index b52b9378812..ba990d58f50 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -449,8 +449,8 @@ void QmlEngine::errorMessageBoxFinished(int result) void QmlEngine::gotoLocation(const Location &location) { - if (QUrl(location.fileName().toString()).isLocalFile()) { // create QUrl to ensure validity - const QString fileName = location.fileName().toString(); + if (QUrl(location.fileName().toUrlishString()).isLocalFile()) { // create QUrl to ensure validity + const QString fileName = location.fileName().toUrlishString(); // internal file from source files -> show generated .js QTC_ASSERT(d->sourceDocuments.contains(fileName), return); @@ -611,9 +611,9 @@ void QmlEngine::executeRunToLine(const ContextData &data) QTC_ASSERT(state() == InferiorStopOk, qDebug() << state()); showStatusMessage(Tr::tr("Run to line %1 (%2) requested...") .arg(data.textPosition.line) - .arg(data.fileName.toString()), + .arg(data.fileName.toUrlishString()), 5000); - d->setBreakpoint(SCRIPTREGEXP, data.fileName.toString(), true, data.textPosition.line); + d->setBreakpoint(SCRIPTREGEXP, data.fileName.toUrlishString(), true, data.textPosition.line); clearExceptionSelection(); d->continueDebugging(Continue); @@ -664,7 +664,7 @@ void QmlEngine::insertBreakpoint(const Breakpoint &bp) d->setExceptionBreak(AllExceptions, requested.enabled); } else if (requested.type == BreakpointByFileAndLine) { - d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toString(), + d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toUrlishString(), requested.enabled, requested.textPosition.line, 0, requested.condition, requested.ignoreCount); @@ -722,7 +722,7 @@ void QmlEngine::updateBreakpoint(const Breakpoint &bp) d->changeBreakpoint(bp, requested.enabled); } else { d->clearBreakpoint(bp); - d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toString(), + d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toUrlishString(), requested.enabled, requested.textPosition.line, 0, requested.condition, requested.ignoreCount); d->breakpointsSync.insert(d->sequence, bp); @@ -1865,7 +1865,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) clearBreakpoint(bp); setBreakpoint(SCRIPTREGEXP, - params.fileName.toString(), + params.fileName.toUrlishString(), params.enabled, params.textPosition.line, newColumn, diff --git a/src/plugins/debugger/shared/coredumputils.cpp b/src/plugins/debugger/shared/coredumputils.cpp index ed7d8621563..d7ea5343b21 100644 --- a/src/plugins/debugger/shared/coredumputils.cpp +++ b/src/plugins/debugger/shared/coredumputils.cpp @@ -62,7 +62,7 @@ LastCore getLastCore() // on 2nd invocation). QString tmpCorePath = QDir::tempPath() + '/' + lastCore.coreFile.fileName(); const auto tmpCore = Utils::FilePath::fromString(tmpCorePath); - if (!tmpCore.exists() && !QFile::copy(lastCore.coreFile.toString(), tmpCorePath)) + if (!tmpCore.exists() && !QFile::copy(lastCore.coreFile.toUrlishString(), tmpCorePath)) return {}; const QString uncompressedCorePath = tmpCorePath.sliced(0, tmpCorePath.size() - 4); diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp index 1644483d8d1..b40fe2690bf 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.cpp +++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp @@ -244,7 +244,7 @@ void UnstartedAppWatcherDialog::startStopTimer(bool start) void UnstartedAppWatcherDialog::findProcess() { - const QString &appName = m_pathChooser->filePath().normalizedPathName().toString(); + const QString &appName = m_pathChooser->filePath().normalizedPathName().toUrlishString(); ProcessInfo fallback; const QList<ProcessInfo> processInfoList = ProcessInfo::processInfoList(); for (const ProcessInfo &processInfo : processInfoList) { @@ -282,8 +282,8 @@ void UnstartedAppWatcherDialog::kitChanged() bool UnstartedAppWatcherDialog::checkExecutableString() const { - if (!m_pathChooser->filePath().toString().isEmpty()) { - QFileInfo fileInfo(m_pathChooser->filePath().toString()); + if (!m_pathChooser->filePath().toUrlishString().isEmpty()) { + QFileInfo fileInfo(m_pathChooser->filePath().toUrlishString()); return (fileInfo.exists() && fileInfo.isFile()); } return false; diff --git a/src/plugins/debugger/uvsc/uvscclient.cpp b/src/plugins/debugger/uvsc/uvscclient.cpp index 0efc73bd205..9013f1c5203 100644 --- a/src/plugins/debugger/uvsc/uvscclient.cpp +++ b/src/plugins/debugger/uvsc/uvscclient.cpp @@ -946,7 +946,7 @@ bool UvscClient::openProject(const Utils::FilePath &projectFile) if (!checkConnection()) return false; - QByteArray prjdata = UvscUtils::encodeProjectData({projectFile.toString()}); + QByteArray prjdata = UvscUtils::encodeProjectData({projectFile.toUrlishString()}); const UVSC_STATUS st = ::UVSC_PRJ_LOAD(m_descriptor, reinterpret_cast<PRJDATA *>(prjdata.data()), prjdata.size()); @@ -982,7 +982,7 @@ bool UvscClient::setProjectSources(const FilePath &sourceDirectory, || sourceFile.endsWith(".s")) { const FilePath parentDir = sourceFile.parentDir(); QString groupName = parentDir.relativeChildPath( - sourceDirectory).toString(); + sourceDirectory).toUrlishString(); if (groupName.isEmpty()) groupName = "default"; @@ -1000,7 +1000,7 @@ bool UvscClient::setProjectSources(const FilePath &sourceDirectory, } // Add new source file to a group. - QByteArray prjdata = UvscUtils::encodeProjectData({groupName, sourceFile.toString()}); + QByteArray prjdata = UvscUtils::encodeProjectData({groupName, sourceFile.toUrlishString()}); const UVSC_STATUS st = ::UVSC_PRJ_ADD_FILE(m_descriptor, reinterpret_cast<PRJDATA *>(prjdata.data()), prjdata.size()); @@ -1033,7 +1033,7 @@ bool UvscClient::setProjectOutputTarget(const Utils::FilePath &outputFile) if (!checkConnection()) return false; - QByteArray prjdata = UvscUtils::encodeProjectData({outputFile.toString()}); + QByteArray prjdata = UvscUtils::encodeProjectData({outputFile.toUrlishString()}); const UVSC_STATUS st = ::UVSC_PRJ_SET_OUTPUTNAME(m_descriptor, reinterpret_cast<PRJDATA *>(prjdata.data()), prjdata.size()); diff --git a/src/plugins/debugger/uvsc/uvscengine.cpp b/src/plugins/debugger/uvsc/uvscengine.cpp index a7bfe69e7bc..fb6786c2331 100644 --- a/src/plugins/debugger/uvsc/uvscengine.cpp +++ b/src/plugins/debugger/uvsc/uvscengine.cpp @@ -97,7 +97,7 @@ void UvscEngine::setupEngine() } showMessage("UVSC: RESOLVING LIBRARY SYMBOLS..."); - m_client.reset(new UvscClient(rp.debugger.command.executable().parentDir().toString())); + m_client.reset(new UvscClient(rp.debugger.command.executable().parentDir().toUrlishString())); if (m_client->error() != UvscClient::NoError) { handleSetupFailure(Tr::tr("Internal error: Cannot resolve the library: %1.") .arg(m_client->errorString())); @@ -357,7 +357,7 @@ void UvscEngine::insertBreakpoint(const Breakpoint &bp) exe.replace('-', '_'); expression += "\\\\" + exe; // Add file name. - expression += "\\" + requested.fileName.toString(); + expression += "\\" + requested.fileName.toUrlishString(); // Add line number. expression += "\\" + QString::number(requested.textPosition.line); } @@ -526,7 +526,7 @@ bool UvscEngine::configureProject(const DebuggerRunParameters &rp) return false; } else if (!m_client->openProject(projectPath)) { handleSetupFailure(Tr::tr("Internal error: Unable to open the uVision project %1: %2.") - .arg(projectPath.toString(), m_client->errorString())); + .arg(projectPath.toUrlishString(), m_client->errorString())); return false; } else { showMessage("UVSC: PROJECT LOADED"); @@ -550,7 +550,7 @@ bool UvscEngine::configureProject(const DebuggerRunParameters &rp) return false; } else if (!m_client->setProjectOutputTarget(targetPath)) { handleSetupFailure(Tr::tr("Internal error: Unable to set the uVision output file %1: %2.") - .arg(targetPath.toString(), m_client->errorString())); + .arg(targetPath.toUrlishString(), m_client->errorString())); return false; } else { showMessage("UVSC: PROJECT OUTPUT TARGET SET"); @@ -592,7 +592,7 @@ void UvscEngine::handleProjectClosed() // Re-open the project again. if (!m_client->openProject(projectPath)) { handleSetupFailure(Tr::tr("Internal error: Unable to open the uVision project %1: %2.") - .arg(projectPath.toString(), m_client->errorString())); + .arg(projectPath.toUrlishString(), m_client->errorString())); return; } diff --git a/src/plugins/designer/designerplugin.cpp b/src/plugins/designer/designerplugin.cpp index cc7b43a0a68..1f7ee80094f 100644 --- a/src/plugins/designer/designerplugin.cpp +++ b/src/plugins/designer/designerplugin.cpp @@ -155,7 +155,7 @@ class DesignerPlugin final : public ExtensionSystem::IPlugin const QString locale = ICore::userInterfaceLanguage(); if (!locale.isEmpty()) { auto qtr = new QTranslator(this); - const QString creatorTrPath = ICore::resourcePath("translations").toString(); + const QString creatorTrPath = ICore::resourcePath("translations").toUrlishString(); const QString qtTrPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath); const QString trFile = "designer_" + locale; if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath)) diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index def031c13cf..aff8b629d74 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -65,7 +65,7 @@ Core::IDocument::OpenResult FormWindowFile::open(QString *errorString, if (readResult != Utils::TextFileFormat::ReadSuccess) return OpenResult::ReadError; - form->setFileName(filePath.absoluteFilePath().toString()); + form->setFileName(filePath.absoluteFilePath().toUrlishString()); const QByteArray contentsBA = contents.toUtf8(); QBuffer str; str.setData(contentsBA); @@ -91,7 +91,7 @@ Result FormWindowFile::saveImpl(const FilePath &filePath, bool autoSave) const QString oldFormName = m_formWindow->fileName(); if (!autoSave) - m_formWindow->setFileName(filePath.toString()); + m_formWindow->setFileName(filePath.toUrlishString()); QString errorString; const bool writeOK = writeFile(filePath, &errorString); m_shouldAutoSave = false; @@ -151,7 +151,7 @@ bool FormWindowFile::setContents(const QByteArray &contents) void FormWindowFile::setFilePath(const FilePath &newName) { - m_formWindow->setFileName(newName.toString()); + m_formWindow->setFileName(newName.toUrlishString()); IDocument::setFilePath(newName); } diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 6914e90b19d..1c28dd415f9 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -582,7 +582,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, const QList<Document::Ptr> docList = findDocumentsIncluding(docTable, uicedName, true); // change to false when we know the absolute path to generated ui_<>.h file DocumentMap docMap; for (const Document::Ptr &d : docList) { - docMap.insert(qAbs(d->filePath().absolutePath().toString() + docMap.insert(qAbs(d->filePath().absolutePath().toUrlishString() .compare(uiFolder, Qt::CaseInsensitive)), d); } diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index fd68bd49d1d..11758d7ec40 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -84,7 +84,7 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources) // Find the (sub-)project the file belongs to. We don't want to find resources // from other parts of the project tree, e.g. via a qmake subdirs project. Node * const fileNode = project->rootProjectNode()->findNode([&fileName](const Node *n) { - return n->filePath().toString() == fileName; + return n->filePath().toUrlishString() == fileName; }); ProjectNode *projectNodeForUiFile = nullptr; if (fileNode) { @@ -111,10 +111,10 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources) QStringList projectQrcFiles; project->rootProjectNode()->forEachNode([&](FileNode *node) { if (node->fileType() == FileType::Resource && useQrcFile(node)) - projectQrcFiles.append(node->filePath().toString()); + projectQrcFiles.append(node->filePath().toUrlishString()); }, [&](FolderNode *node) { if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node) && useQrcFile(node)) - projectQrcFiles.append(node->filePath().toString()); + projectQrcFiles.append(node->filePath().toUrlishString()); }); // Check if the user has chosen to update the lacking resource inside designer if (dirty && updateProjectResources) { diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 1a62c6d3d27..c4878d60ad8 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -230,7 +230,7 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const TextFileFormat format = textDocument->format(); QString leftText; - const QString fileName = textDocument->filePath().toString(); + const QString fileName = textDocument->filePath().toUrlishString(); const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile( FilePath::fromString(fileName), format.codec(), &leftText, &format, &errorString); @@ -283,7 +283,7 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const TextFileFormat format = textDocument->format(); QString leftText; - const QString fileName = textDocument->filePath().toString(); + const QString fileName = textDocument->filePath().toUrlishString(); const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile( FilePath::fromString(fileName), format.codec(), &leftText, &format, &errorString); @@ -500,7 +500,7 @@ void DiffEditorPlugin::diffCurrentFile() if (!textDocument) return; - const QString fileName = textDocument->filePath().toString(); + const QString fileName = textDocument->filePath().toUrlishString(); if (fileName.isEmpty()) return; @@ -530,9 +530,9 @@ void DiffEditorPlugin::diffExternalFiles() return; const QString documentId = QLatin1String(Constants::DIFF_EDITOR_PLUGIN) - + ".DiffExternalFiles." + filePath1.toString() + '.' + filePath2.toString(); - const QString title = Tr::tr("Diff \"%1\", \"%2\"").arg(filePath1.toString(), filePath2.toString()); - reload<DiffExternalFilesController>(documentId, title, filePath1.toString(), filePath2.toString()); + + ".DiffExternalFiles." + filePath1.toUrlishString() + '.' + filePath2.toUrlishString(); + const QString title = Tr::tr("Diff \"%1\", \"%2\"").arg(filePath1.toUrlishString(), filePath2.toUrlishString()); + reload<DiffExternalFilesController>(documentId, title, filePath1.toUrlishString(), filePath2.toUrlishString()); } } // namespace DiffEditor::Internal diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 3eb9e37f2ae..5217d0be38e 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -556,7 +556,7 @@ DockerDevice::DockerDevice() mounts.setSettingsKey(DockerDeviceMappedPaths); mounts.setLabelText(Tr::tr("Paths to mount:")); - mounts.setDefaultValue({Core::DocumentManager::projectsDirectory().toString()}); + mounts.setDefaultValue({Core::DocumentManager::projectsDirectory().toUrlishString()}); mounts.setToolTip(Tr::tr("Maps paths in this list one-to-one to the docker container.")); mounts.setPlaceHolderText(Tr::tr("Host directories to mount into the container.")); @@ -1433,7 +1433,7 @@ expected_str<FilePath> DockerDevicePrivate::localSource(const FilePath &other) c } } - return make_unexpected(Tr::tr("localSource: No mount point found for %1").arg(other.toString())); + return make_unexpected(Tr::tr("localSource: No mount point found for %1").arg(other.toUrlishString())); } bool DockerDevicePrivate::ensureReachable(const FilePath &other) diff --git a/src/plugins/effectcomposer/effectcomposermodel.cpp b/src/plugins/effectcomposer/effectcomposermodel.cpp index 44b68780fe1..ad9457dc295 100644 --- a/src/plugins/effectcomposer/effectcomposermodel.cpp +++ b/src/plugins/effectcomposer/effectcomposermodel.cpp @@ -282,7 +282,7 @@ void EffectComposerModel::assignToSelected() QString EffectComposerModel::getUniqueEffectName() const { const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory(); - const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended("%1.qep").toString() + const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended("%1.qep").toUrlishString() : effectsDir + '/' + "%1" + ".qep"; return QmlDesigner::UniqueName::generate("Effect01", [&] (const QString &effectName) { @@ -300,7 +300,7 @@ QString EffectComposerModel::getUniqueDisplayName(const QStringList reservedName bool EffectComposerModel::nameExists(const QString &name) const { const QString effectsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory(); - const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended("%1.qep").toString() + const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended("%1.qep").toUrlishString() : effectsDir + '/' + "%1" + ".qep"; return QFile::exists(path.arg(name)); @@ -1220,7 +1220,7 @@ void EffectComposerModel::saveComposition(const QString &name) const QString effectsAssetsDir = QmlDesigner::ModelNodeOperations::getEffectsDefaultDirectory(); - const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended(name + ".qep").toString() + const QString path = !m_compositionPath.isEmpty() ? m_compositionPath.parentDir().pathAppended(name + ".qep").toUrlishString() : effectsAssetsDir + '/' + name + ".qep"; auto saveFile = QFile(path); @@ -1467,7 +1467,7 @@ void EffectComposerModel::saveResources(const QString &name) // Get effects dir const Utils::FilePath effectsResDir = QmlDesigner::ModelNodeOperations::getEffectsImportDirectory(); - const QString effectsResPath = effectsResDir.pathAppended(name).toString() + '/'; + const QString effectsResPath = effectsResDir.pathAppended(name).toUrlishString() + '/'; Utils::FilePath effectPath = Utils::FilePath::fromString(effectsResPath); // Create the qmldir for effects @@ -1604,7 +1604,7 @@ void EffectComposerModel::saveResources(const QString &name) if (fileNameToUniformHash.contains(dests[i])) { Uniform *uniform = fileNameToUniformHash[dests[i]]; - const QVariant newValue = target.toString(); + const QVariant newValue = target.toUrlishString(); uniform->setDefaultValue(newValue); uniform->setValue(newValue); } diff --git a/src/plugins/effectcomposer/effectcomposernodesmodel.cpp b/src/plugins/effectcomposer/effectcomposernodesmodel.cpp index 457d7bfb46d..7b8795f7a6e 100644 --- a/src/plugins/effectcomposer/effectcomposernodesmodel.cpp +++ b/src/plugins/effectcomposer/effectcomposernodesmodel.cpp @@ -54,7 +54,7 @@ void EffectComposerNodesModel::loadModel() m_categories = {}; - QDirIterator itCategories(nodesPath.toString(), QDir::Dirs | QDir::NoDotAndDotDot); + QDirIterator itCategories(nodesPath.toUrlishString(), QDir::Dirs | QDir::NoDotAndDotDot); while (itCategories.hasNext()) { itCategories.next(); @@ -65,7 +65,7 @@ void EffectComposerNodesModel::loadModel() QList<EffectNode *> effects = {}; Utils::FilePath categoryPath = nodesPath.resolvePath(itCategories.fileName()); - QDirIterator itEffects(categoryPath.toString(), {"*.qen"}, QDir::Files); + QDirIterator itEffects(categoryPath.toUrlishString(), {"*.qen"}, QDir::Files); while (itEffects.hasNext()) { itEffects.next(); auto node = new EffectNode(itEffects.filePath()); diff --git a/src/plugins/effectcomposer/effectcomposerview.cpp b/src/plugins/effectcomposer/effectcomposerview.cpp index fe0955e4e9e..6b6a43f5e4e 100644 --- a/src/plugins/effectcomposer/effectcomposerview.cpp +++ b/src/plugins/effectcomposer/effectcomposerview.cpp @@ -141,7 +141,7 @@ void EffectComposerView::modelAttached(QmlDesigner::Model *model) AbstractView::modelAttached(model); - QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toString(); + QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toUrlishString(); if (m_currProjectPath != currProjectPath) { // starting a new project m_widget->effectComposerNodesModel()->loadModel(); diff --git a/src/plugins/effectcomposer/effectcomposerwidget.cpp b/src/plugins/effectcomposer/effectcomposerwidget.cpp index c6d37ede6e7..ebf61b1a1ed 100644 --- a/src/plugins/effectcomposer/effectcomposerwidget.cpp +++ b/src/plugins/effectcomposer/effectcomposerwidget.cpp @@ -50,7 +50,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } static QList<QmlDesigner::ModelNode> modelNodesFromMimeData(const QByteArray &mimeData, @@ -211,7 +211,7 @@ QString EffectComposerWidget::uniformDefaultImage(const QString &nodeName, const QString EffectComposerWidget::imagesPath() const { - return Core::ICore::resourcePath("qmldesigner/effectComposerNodes/images").toString(); + return Core::ICore::resourcePath("qmldesigner/effectComposerNodes/images").toUrlishString(); } bool EffectComposerWidget::isEffectAsset(const QUrl &url) const @@ -259,7 +259,7 @@ QString EffectComposerWidget::qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/effectComposerQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/effectComposerQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/effectComposerQmlSources").toUrlishString(); } void EffectComposerWidget::initView() diff --git a/src/plugins/effectcomposer/effectshaderscodeeditor.cpp b/src/plugins/effectcomposer/effectshaderscodeeditor.cpp index 8eb77c5ae26..e81dad4aec0 100644 --- a/src/plugins/effectcomposer/effectshaderscodeeditor.cpp +++ b/src/plugins/effectcomposer/effectshaderscodeeditor.cpp @@ -56,7 +56,7 @@ QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } template<typename T> diff --git a/src/plugins/effectcomposer/effectutils.cpp b/src/plugins/effectcomposer/effectutils.cpp index 157b3c191be..45a1ea54614 100644 --- a/src/plugins/effectcomposer/effectutils.cpp +++ b/src/plugins/effectcomposer/effectutils.cpp @@ -28,7 +28,7 @@ QString EffectUtils::nodesSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/effectComposerNodes"; #endif - return Core::ICore::resourcePath("qmldesigner/effectComposerNodes").toString(); + return Core::ICore::resourcePath("qmldesigner/effectComposerNodes").toUrlishString(); } } // namespace EffectComposer diff --git a/src/plugins/effectcomposer/uniform.cpp b/src/plugins/effectcomposer/uniform.cpp index be25c1c5e47..4c577fc0319 100644 --- a/src/plugins/effectcomposer/uniform.cpp +++ b/src/plugins/effectcomposer/uniform.cpp @@ -436,7 +436,7 @@ QString Uniform::getResourcePath(const QString &effectName, const QString &value return value; } else if (qenPath.isEmpty()) { const Utils::FilePath effectsResDir = QmlDesigner::ModelNodeOperations::getEffectsImportDirectory(); - return effectsResDir.pathAppended(effectName).pathAppended(value).toString(); + return effectsResDir.pathAppended(effectName).pathAppended(value).toUrlishString(); } else { QDir dir(m_qenPath); dir.cdUp(); diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index cf91672d749..9e7d2664ffc 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1791,7 +1791,7 @@ void FakeVimPlugin::editorOpened(IEditor *editor) *output = proc.cleanedStdOut(); }); - handler->setCurrentFileName(editor->document()->filePath().toString()); + handler->setCurrentFileName(editor->document()->filePath().toUrlishString()); handler->installEventFilter(); // pop up the bar @@ -1819,7 +1819,7 @@ void FakeVimPlugin::currentEditorAboutToChange(IEditor *editor) void FakeVimPlugin::allDocumentsRenamed(const FilePath &oldPath, const FilePath &newPath) { renameFileNameInEditors(oldPath, newPath); - FakeVimHandler::updateGlobalMarksFilenames(oldPath.toString(), newPath.toString()); + FakeVimHandler::updateGlobalMarksFilenames(oldPath.toUrlishString(), newPath.toUrlishString()); } void FakeVimPlugin::documentRenamed( @@ -1831,8 +1831,8 @@ void FakeVimPlugin::documentRenamed( void FakeVimPlugin::renameFileNameInEditors(const FilePath &oldPath, const FilePath &newPath) { for (const HandlerAndData &handlerAndData : m_editorToHandler) { - if (handlerAndData.handler->currentFileName() == oldPath.toString()) - handlerAndData.handler->setCurrentFileName(newPath.toString()); + if (handlerAndData.handler->currentFileName() == oldPath.toUrlishString()) + handlerAndData.handler->setCurrentFileName(newPath.toUrlishString()); } } @@ -1915,7 +1915,7 @@ void FakeVimPlugin::handleExCommand(FakeVimHandler *handler, bool *handled, cons bool saved = false; IEditor *editor = editorFromHandler(); const QString fileName = handler->currentFileName(); - if (editor && editor->document()->filePath().toString() == fileName) { + if (editor && editor->document()->filePath().toUrlishString() == fileName) { triggerAction(Core::Constants::SAVE); saved = !editor->document()->isModified(); if (saved) { diff --git a/src/plugins/fossil/configuredialog.cpp b/src/plugins/fossil/configuredialog.cpp index e5b6c8f3e77..3f38a7f0d16 100644 --- a/src/plugins/fossil/configuredialog.cpp +++ b/src/plugins/fossil/configuredialog.cpp @@ -22,7 +22,7 @@ public: RepositorySettings settings() const { return {m_userLineEdit->text().trimmed(), - m_sslIdentityFilePathChooser->filePath().toString(), + m_sslIdentityFilePathChooser->filePath().toUrlishString(), m_disableAutosyncCheckBox->isChecked() ? RepositorySettings::AutosyncOff : RepositorySettings::AutosyncOn}; } diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp index deb2ed9c296..8fcc9856bed 100644 --- a/src/plugins/fossil/fossilclient.cpp +++ b/src/plugins/fossil/fossilclient.cpp @@ -586,7 +586,7 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory, // @TODO: what about --template options? const FilePath fullRepoName = FilePath::fromStringWithExtension(repoName, Constants::FOSSIL_FILE_SUFFIX); - const FilePath repoFilePath = repoPath.pathAppended(fullRepoName.toString()); + const FilePath repoFilePath = repoPath.pathAppended(fullRepoName.toUrlishString()); QStringList args(vcsCommandString(CreateRepositoryCommand)); if (!adminUser.isEmpty()) args << "--admin-user" << adminUser; @@ -989,7 +989,7 @@ void FossilClient::revertFile(const FilePath &workingDir, // Indicate file list VcsCommand *cmd = createCommand(workingDir); - const QStringList files = {workingDir.toString() + "/" + file}; + const QStringList files = {workingDir.toUrlishString() + "/" + file}; connect(cmd, &VcsCommand::done, this, [this, files, cmd] { if (cmd->result() == ProcessResult::FinishedWithSuccess) emit changed(files); @@ -1013,7 +1013,7 @@ void FossilClient::revertAll(const FilePath &workingDir, const QString &revision // Indicate repository change VcsCommand *cmd = createCommand(workingDir); - const QStringList files = QStringList(workingDir.toString()); + const QStringList files = QStringList(workingDir.toUrlishString()); connect(cmd, &VcsCommand::done, this, [this, files, cmd] { if (cmd->result() == ProcessResult::FinishedWithSuccess) emit changed(files); diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp index 6ec17bbd086..aa10ff60bfe 100644 --- a/src/plugins/fossil/fossilplugin.cpp +++ b/src/plugins/fossil/fossilplugin.cpp @@ -758,7 +758,7 @@ bool FossilPluginPrivate::activateCommit() // Whether local commit or not if (commitWidget->isPrivateOptionEnabled()) extraOptions += "--private"; - fossilClient().commit(m_submitRepository, files, editorDocument->filePath().toString(), extraOptions); + fossilClient().commit(m_submitRepository, files, editorDocument->filePath().toUrlishString(), extraOptions); } return true; } @@ -909,7 +909,7 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou const QString fossilFile = options.value("fossil-file"); const FilePath fossilFilePath = FilePath::fromUserInput(QDir::fromNativeSeparators(fossilFile)); const QString fossilFileNative = fossilFilePath.toUserOutput(); - const QFileInfo cloneRepository(fossilFilePath.toString()); + const QFileInfo cloneRepository(fossilFilePath.toUrlishString()); // Check when requested to clone a local repository and clone-into repository file is the same // or not specified. diff --git a/src/plugins/fossil/pullorpushdialog.cpp b/src/plugins/fossil/pullorpushdialog.cpp index 8c0df1dd522..dd19f76e04f 100644 --- a/src/plugins/fossil/pullorpushdialog.cpp +++ b/src/plugins/fossil/pullorpushdialog.cpp @@ -84,7 +84,7 @@ QString PullOrPushDialog::remoteLocation() const if (m_defaultButton->isChecked()) return {}; if (m_localButton->isChecked()) - return m_localPathChooser->filePath().toString(); + return m_localPathChooser->filePath().toUrlishString(); return m_urlLineEdit->text(); } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 554d3629bf9..3a0d1094af6 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -314,8 +314,8 @@ static void insertSorted(QStringList *list, const QString &value) bool GenericBuildSystem::addFiles(Node *, const FilePaths &filePaths_, FilePaths *) { - const QStringList filePaths = Utils::transform(filePaths_, &FilePath::toString); - const QDir baseDir(projectDirectory().toString()); + const QStringList filePaths = Utils::transform(filePaths_, &FilePath::toUrlishString); + const QDir baseDir(projectDirectory().toUrlishString()); QStringList newList = m_rawFileList; if (filePaths.size() > m_rawFileList.size()) { newList += transform(filePaths, [&baseDir](const QString &p) { @@ -339,7 +339,7 @@ bool GenericBuildSystem::addFiles(Node *, const FilePaths &filePaths_, FilePaths toAdd << directory; } - const QDir dir(projectDirectory().toString()); + const QDir dir(projectDirectory().toUrlishString()); const auto candidates = toAdd; for (const QString &path : candidates) { QString relative = dir.relativeFilePath(path); @@ -360,7 +360,7 @@ RemovedFilesFromProject GenericBuildSystem::removeFiles(Node *, const FilePaths QStringList newList = m_rawFileList; for (const FilePath &filePath : filePaths) { - QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath.toString()); + QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath.toUrlishString()); if (i != m_rawListEntries.end()) newList.removeOne(i.value()); } @@ -372,7 +372,7 @@ RemovedFilesFromProject GenericBuildSystem::removeFiles(Node *, const FilePaths bool GenericBuildSystem::setFiles(const QStringList &filePaths) { QStringList newList; - QDir baseDir(projectDirectory().toString()); + QDir baseDir(projectDirectory().toUrlishString()); for (const QString &filePath : filePaths) newList.append(baseDir.relativeFilePath(filePath)); Utils::sort(newList); @@ -392,7 +392,7 @@ bool GenericBuildSystem::renameFiles(Node *, const FilePairs &filesToRename, Fil *notRenamed << oldFilePath; }; - const auto i = m_rawListEntries.find(oldFilePath.toString()); + const auto i = m_rawListEntries.find(oldFilePath.toUrlishString()); if (i == m_rawListEntries.end()) { fail(); continue; @@ -404,9 +404,9 @@ bool GenericBuildSystem::renameFiles(Node *, const FilePairs &filesToRename, Fil continue; } - QDir baseDir(projectDirectory().toString()); + QDir baseDir(projectDirectory().toUrlishString()); newList.removeAt(index); - insertSorted(&newList, baseDir.relativeFilePath(newFilePath.toString())); + insertSorted(&newList, baseDir.relativeFilePath(newFilePath.toUrlishString())); } if (!saveRawFileList(newList)) { @@ -465,9 +465,9 @@ FilePath GenericBuildSystem::findCommonSourceRoot() if (m_files.isEmpty()) return FilePath::fromFileInfo(QFileInfo(m_filesFileName)); - QString root = m_files.front().first.toString(); + QString root = m_files.front().first.toUrlishString(); for (const SourceFile &sourceFile : std::as_const(m_files)) { - const QString item = sourceFile.first.toString(); + const QString item = sourceFile.first.toUrlishString(); if (root.length() > item.length()) root.truncate(item.length()); @@ -542,7 +542,7 @@ GenericBuildSystem::SourceFiles GenericBuildSystem::processEntries( const MacroExpander *expander = buildConfig ? buildConfig->macroExpander() : target()->macroExpander(); - const QDir projectDir(projectDirectory().toString()); + const QDir projectDir(projectDirectory().toUrlishString()); QFileInfo fileInfo; SourceFiles sourceFiles; @@ -555,7 +555,7 @@ GenericBuildSystem::SourceFiles GenericBuildSystem::processEntries( trimmedPath = buildEnv.expandVariables(trimmedPath); trimmedPath = expander->expand(trimmedPath); - trimmedPath = FilePath::fromUserInput(trimmedPath).toString(); + trimmedPath = FilePath::fromUserInput(trimmedPath).toUrlishString(); QStringList tagsForFile; const int tagListPos = trimmedPath.indexOf('|'); @@ -599,7 +599,7 @@ void GenericBuildSystem::refreshCppCodeModel() static const auto sourceFilesToStringList = [](const SourceFiles &sourceFiles) { return Utils::transform(sourceFiles, [](const SourceFile &f) { - return f.first.toString(); + return f.first.toUrlishString(); }); }; rpp.setFiles(sourceFilesToStringList(m_files)); @@ -714,7 +714,7 @@ void GenericProject::editFilesTriggered() if (sfd.exec() == QDialog::Accepted) { if (Target *t = activeTarget()) { auto bs = static_cast<GenericBuildSystem *>(t->buildSystem()); - bs->setFiles(transform(sfd.selectedFiles(), &FilePath::toString)); + bs->setFiles(transform(sfd.selectedFiles(), &FilePath::toUrlishString)); } } } diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 096a39e0b20..f8d3866b500 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -196,14 +196,14 @@ protected: const FilePath configFileName = projectPath.pathAppended(projectName + ".config"); const FilePath cxxflagsFileName = projectPath.pathAppended(projectName + ".cxxflags"); const FilePath cflagsFileName = projectPath.pathAppended(projectName + ".cflags"); - const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toString); + const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toUrlishString); MimeType headerTy = Utils::mimeTypeForName(QLatin1String("text/x-chdr")); QStringList nameFilters = headerTy.globPatterns(); QStringList includePaths; - const QDir dir(projectPath.toString()); + const QDir dir(projectPath.toUrlishString()); for (const QString &path : paths) { QFileInfo fileInfo(path); if (fileInfo.fileName() != "include") @@ -223,7 +223,7 @@ protected: generatedCreatorFile.setContents(QLatin1String("[General]\n")); generatedCreatorFile.setAttributes(GeneratedFile::OpenProjectAttribute); - QStringList sources = Utils::transform(wizard->selectedFiles(), &FilePath::toString); + QStringList sources = Utils::transform(wizard->selectedFiles(), &FilePath::toUrlishString); for (int i = 0; i < sources.length(); ++i) sources[i] = dir.relativeFilePath(sources[i]); Utils::sort(sources); diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index ca1a65fb9ae..aa9823d8bd0 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -557,7 +557,7 @@ ShowController::ShowController(IDocument *document, const QString &id) const Group root { storage, parallel, - onGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }), + onGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toUrlishString()); }), Group { finishAllAndSuccess, ProcessTask(onDescriptionSetup, onDescriptionDone, CallDoneIf::Success), @@ -870,7 +870,7 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const FilePaths res; for (auto it = filesForDir.begin(), end = filesForDir.end(); it != end; ++it) { QStringList args({"ls-files", "-z"}); - const QDir wd(it.key().toString()); + const QDir wd(it.key().toUrlishString()); args << transform(it.value(), [&wd](const QString &fp) { return wd.relativeFilePath(fp); }); const CommandResult result = vcsSynchronousExec(it.key(), args, RunFlags::NoOutput); if (result.result() != ProcessResult::FinishedWithSuccess) @@ -891,7 +891,7 @@ IVersionControl::FileState GitClient::modificationState(const Utils::FilePath &w const Utils::FilePath &fileName) const { const ModificationInfo &info = m_modifInfos[workingDirectory]; - int length = workingDirectory.toString().size(); + int length = workingDirectory.toUrlishString().size(); const QString fileNameFromRoot = fileName.absoluteFilePath().path().mid(length + 1); return info.modifiedFiles.value(fileNameFromRoot, IVersionControl::FileState::NoModification); } @@ -1033,7 +1033,7 @@ void GitClient::diffFiles(const FilePath &workingDirectory, const QStringList &stagedFileNames) const { const QString documentId = QLatin1String(Constants::GIT_PLUGIN) - + QLatin1String(".DiffFiles.") + workingDirectory.toString(); + + QLatin1String(".DiffFiles.") + workingDirectory.toUrlishString(); requestReload(documentId, workingDirectory, Tr::tr("Git Diff Files"), workingDirectory, [stagedFileNames, unstagedFileNames](IDocument *doc) { @@ -1044,7 +1044,7 @@ void GitClient::diffFiles(const FilePath &workingDirectory, void GitClient::diffProject(const FilePath &workingDirectory, const QString &projectDirectory) const { const QString documentId = QLatin1String(Constants::GIT_PLUGIN) - + QLatin1String(".DiffProject.") + workingDirectory.toString(); + + QLatin1String(".DiffProject.") + workingDirectory.toUrlishString(); requestReload(documentId, workingDirectory, Tr::tr("Git Diff Project"), workingDirectory, [projectDirectory](IDocument *doc){ @@ -1057,7 +1057,7 @@ void GitClient::diffRepository(const FilePath &workingDirectory, const QString &rightCommit) const { const QString documentId = QLatin1String(Constants::GIT_PLUGIN) - + QLatin1String(".DiffRepository.") + workingDirectory.toString(); + + QLatin1String(".DiffRepository.") + workingDirectory.toUrlishString(); requestReload(documentId, workingDirectory, Tr::tr("Git Diff Repository"), workingDirectory, [&leftCommit, &rightCommit](IDocument *doc) { return new GitDiffEditorController(doc, leftCommit, rightCommit, {}); @@ -1069,7 +1069,7 @@ void GitClient::diffFile(const FilePath &workingDirectory, const QString &fileNa const QString title = Tr::tr("Git Diff \"%1\"").arg(fileName); const FilePath sourceFile = VcsBaseEditor::getSource(workingDirectory, fileName); const QString documentId = QLatin1String(Constants::GIT_PLUGIN) - + QLatin1String(".DifFile.") + sourceFile.toString(); + + QLatin1String(".DifFile.") + sourceFile.toUrlishString(); requestReload(documentId, sourceFile, title, workingDirectory, [&fileName](IDocument *doc) { return new GitDiffEditorController(doc, {}, {}, {"--", fileName}); @@ -1125,7 +1125,7 @@ void GitClient::log(const FilePath &workingDirectory, const QString &fileName, else if (!args.isEmpty() && !args.first().startsWith('-')) msgArg = args.first(); else - msgArg = workingDirectory.toString(); + msgArg = workingDirectory.toUrlishString(); // Creating document might change the referenced workingDirectory. Store a copy and use it. const FilePath workingDir = workingDirectory; const QString title = Tr::tr("Git Log \"%1\"").arg(msgArg); @@ -1190,7 +1190,7 @@ void GitClient::reflog(const FilePath &workingDirectory, const QString &ref) const FilePath workingDir = workingDirectory; GitEditorWidget *editor = static_cast<GitEditorWidget *>( createVcsEditor(editorId, title, workingDir, encoding(EncodingLogOutput), - "reflogRepository", workingDir.toString())); + "reflogRepository", workingDir.toUrlishString())); VcsBaseEditorConfig *argWidget = editor->editorConfig(); if (!argWidget) { argWidget = new GitRefLogConfig(editor); @@ -1274,7 +1274,7 @@ void GitClient::archive(const FilePath &workingDirectory, QString commit) if (archiveName.isEmpty()) return; const QString extension = filters.value(selectedFilter); - QFileInfo archive(archiveName.toString()); + QFileInfo archive(archiveName.toUrlishString()); if (extension != "." + archive.completeSuffix()) { archive = QFileInfo(archive.filePath() + extension); } @@ -1351,7 +1351,7 @@ QStringList GitClient::setupCheckoutArguments(const FilePath &workingDirectory, { QStringList arguments = {"checkout", ref}; - QStringList localBranches = synchronousRepositoryBranches(workingDirectory.toString()); + QStringList localBranches = synchronousRepositoryBranches(workingDirectory.toUrlishString()); if (localBranches.contains(ref)) return arguments; @@ -2064,7 +2064,7 @@ SubmoduleDataMap GitClient::submoduleList(const FilePath &workingDirectory) cons // if config found submodules if (!result.isEmpty()) { - QSettings gitmodulesFile(gitmodulesFileName.toString(), QSettings::IniFormat); + QSettings gitmodulesFile(gitmodulesFileName.toUrlishString(), QSettings::IniFormat); const QList<QString> submodules = result.keys(); for (const QString &submoduleName : submodules) { @@ -2475,7 +2475,7 @@ void GitClient::launchRepositoryBrowser(const FilePath &workingDirectory) const { const FilePath repBrowserBinary = settings().repositoryBrowserCmd(); if (!repBrowserBinary.isEmpty()) - Process::startDetached({repBrowserBinary, {workingDirectory.toString()}}, workingDirectory); + Process::startDetached({repBrowserBinary, {workingDirectory.toUrlishString()}}, workingDirectory); } static FilePath gitBinDir(const GitClient::GitKLaunchTrial trial, const FilePath &parentDir) @@ -2508,7 +2508,7 @@ void GitClient::tryLaunchingGitK(const Environment &env, // If git/bin is in path, use 'wish' shell to run. Otherwise (git/cmd), directly run gitk const FilePath wish = gitBinDirectory.pathAppended("wish").withExecutableSuffix(); if (wish.withExecutableSuffix().exists()) { - arguments << binary.toString(); + arguments << binary.toUrlishString(); binary = wish; } } @@ -2582,7 +2582,7 @@ bool GitClient::launchGitGui(const FilePath &workingDirectory) { FilePath GitClient::gitBinDirectory() const { - const QString git = vcsBinary({}).toString(); + const QString git = vcsBinary({}).toUrlishString(); if (git.isEmpty()) return {}; @@ -2977,7 +2977,7 @@ GitClient::RevertResult GitClient::revertI(QStringList files, // If we are looking at files, make them relative to the repository // directory to match them in the status output list. if (!isDirectory) { - const QDir repoDir(repoDirectory.toString()); + const QDir repoDir(repoDirectory.toUrlishString()); const QStringList::iterator cend = files.end(); for (QStringList::iterator it = files.begin(); it != cend; ++it) *it = repoDir.relativeFilePath(*it); @@ -3189,7 +3189,7 @@ void GitClient::subversionLog(const FilePath &workingDirectory) const const Id editorId = Git::Constants::GIT_SVN_LOG_EDITOR_ID; const FilePath sourceFile = VcsBaseEditor::getSource(workingDirectory, QStringList()); VcsBaseEditorWidget *editor = createVcsEditor(editorId, title, sourceFile, encoding(EncodingDefault), - "svnLog", sourceFile.toString()); + "svnLog", sourceFile.toUrlishString()); editor->setWorkingDirectory(workingDirectory); vcsExecWithEditor(workingDirectory, arguments, editor); } @@ -3854,8 +3854,8 @@ IEditor *GitClient::openShowEditor(const FilePath &workingDirectory, const QStri const FilePath &path, ShowEditor showSetting) { const FilePath topLevel = VcsManager::findTopLevelForDirectory(workingDirectory); - const QString topLevelString = topLevel.toString(); - const QString relativePath = QDir(topLevelString).relativeFilePath(path.toString()); + const QString topLevelString = topLevel.toUrlishString(); + const QString relativePath = QDir(topLevelString).relativeFilePath(path.toUrlishString()); const QByteArray content = synchronousShow(topLevel, ref + ":" + relativePath); if (showSetting == ShowEditor::OnlyIfDifferent) { if (content.isEmpty()) diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index fc0d69bef60..2b183b170de 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -169,7 +169,7 @@ public: void vcsAnnotate(const FilePath &filePath, int line) final; void vcsLog(const Utils::FilePath &topLevel, const Utils::FilePath &relativeDirectory) final { - gitClient().log(topLevel, relativeDirectory.toString(), true); + gitClient().log(topLevel, relativeDirectory.toUrlishString(), true); } void vcsDescribe(const FilePath &source, const QString &id) final { gitClient().show(source, id); } QString vcsTopic(const FilePath &directory) final; @@ -1094,7 +1094,7 @@ void GitPluginPrivate::undoFileChanges(bool revertStaging) const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); FileChangeBlocker fcb(state.currentFile()); - gitClient().revertFiles({state.currentFile().toString()}, revertStaging); + gitClient().revertFiles({state.currentFile().toUrlishString()}, revertStaging); } class ResetItemDelegate : public LogItemDelegate @@ -1269,7 +1269,7 @@ void GitPluginPrivate::gitkForCurrentFolder() * one line command mentioned above. * */ - QDir dir(state.currentFileDirectory().toString()); + QDir dir(state.currentFileDirectory().toUrlishString()); if (QFileInfo(dir,".git").exists() || dir.cd(".git")) { gitClient().launchGitK(state.currentFileDirectory()); } else { @@ -1761,7 +1761,7 @@ bool GitPluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) const return false; if (filePath.isDir()) return true; - QFile file(filePath.toString()); + QFile file(filePath.toUrlishString()); if (!file.open(QFile::ReadOnly)) return false; return file.read(8) == "gitdir: "; diff --git a/src/plugins/git/instantblame.cpp b/src/plugins/git/instantblame.cpp index 0eb491c3372..41c7d50fe90 100644 --- a/src/plugins/git/instantblame.cpp +++ b/src/plugins/git/instantblame.cpp @@ -378,7 +378,7 @@ void InstantBlame::perform() m_lastVisitedEditorLine = line; const Utils::FilePath filePath = widget->textDocument()->filePath(); - const QFileInfo fi(filePath.toString()); + const QFileInfo fi(filePath.toUrlishString()); const Utils::FilePath workingDirectory = Utils::FilePath::fromString(fi.path()); const QString lineString = QString("%1,%1").arg(line); const auto lineDiffHandler = [this](const CommandResult &result) { @@ -436,7 +436,7 @@ void InstantBlame::perform() options.append("-w"); if (settings().instantBlameIgnoreLineMoves()) options.append("-M"); - options.append({"-L", lineString, "--", filePath.toString()}); + options.append({"-L", lineString, "--", filePath.toUrlishString()}); qCDebug(log) << "Running git" << options.join(' '); gitClient().vcsExecWithHandler(workingDirectory, options, this, commandHandler, RunFlags::NoOutput, m_codec); diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp index 2eaae7cda21..f0b6972ca52 100644 --- a/src/plugins/gitlab/gitlabclonedialog.cpp +++ b/src/plugins/gitlab/gitlabclonedialog.cpp @@ -207,12 +207,12 @@ void GitLabCloneDialog::cloneFinished(bool success) // limit the files to the most top-level item(s) int minimum = std::numeric_limits<int>::max(); for (const FilePath &f : filesWeMayOpen) { - int parentCount = f.toString().count('/'); + int parentCount = f.toUrlishString().count('/'); if (parentCount < minimum) minimum = parentCount; } filesWeMayOpen = filtered(filesWeMayOpen, [minimum](const FilePath &f) { - return f.toString().count('/') == minimum; + return f.toUrlishString().count('/') == minimum; }); hide(); // avoid to many dialogs.. FIXME: maybe change to some wizard approach? diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index a454057ce26..72e4f91ecd9 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -131,7 +131,7 @@ private: const int variant = GLSL::Lexer::Variant_All; QByteArray code; - QFile file(Core::ICore::resourcePath("glsl").pathAppended(m_fileName).toString()); + QFile file(Core::ICore::resourcePath("glsl").pathAppended(m_fileName).toUrlishString()); if (file.open(QFile::ReadOnly)) code = file.readAll(); diff --git a/src/plugins/haskell/haskellmanager.cpp b/src/plugins/haskell/haskellmanager.cpp index e62fa04bb23..43351b773e7 100644 --- a/src/plugins/haskell/haskellmanager.cpp +++ b/src/plugins/haskell/haskellmanager.cpp @@ -28,8 +28,8 @@ FilePath findProjectDirectory(const FilePath &filePath) if (filePath.isEmpty()) return {}; - QDir directory(filePath.toFileInfo().isDir() ? filePath.toString() - : filePath.parentDir().toString()); + QDir directory(filePath.toFileInfo().isDir() ? filePath.toUrlishString() + : filePath.parentDir().toUrlishString()); directory.setNameFilters({"stack.yaml", "*.cabal"}); directory.setFilter(QDir::Files | QDir::Readable); do { @@ -41,7 +41,7 @@ FilePath findProjectDirectory(const FilePath &filePath) void openGhci(const FilePath &haskellFile) { - const QList<MimeType> mimeTypes = mimeTypesForFileName(haskellFile.toString()); + const QList<MimeType> mimeTypes = mimeTypesForFileName(haskellFile.toUrlishString()); const bool isHaskell = Utils::anyOf(mimeTypes, [](const MimeType &mt) { return mt.inherits("text/x-haskell") || mt.inherits("text/x-literate-haskell"); }); diff --git a/src/plugins/haskell/haskellproject.cpp b/src/plugins/haskell/haskellproject.cpp index c9378ac317c..12ed2dce4c0 100644 --- a/src/plugins/haskell/haskellproject.cpp +++ b/src/plugins/haskell/haskellproject.cpp @@ -30,7 +30,7 @@ static QVector<QString> parseExecutableNames(const FilePath &projectFilePath) static const QString EXECUTABLE = "executable"; static const int EXECUTABLE_LEN = EXECUTABLE.length(); QVector<QString> result; - QFile file(projectFilePath.toString()); + QFile file(projectFilePath.toUrlishString()); if (file.open(QFile::ReadOnly)) { QTextStream stream(&file); while (!stream.atEnd()) { diff --git a/src/plugins/haskell/haskellrunconfiguration.cpp b/src/plugins/haskell/haskellrunconfiguration.cpp index 749fe050e78..146d6898ecf 100644 --- a/src/plugins/haskell/haskellrunconfiguration.cpp +++ b/src/plugins/haskell/haskellrunconfiguration.cpp @@ -55,8 +55,8 @@ private: QStringList args; if (BuildConfiguration *buildConfiguration = target()->activeBuildConfiguration()) { args << "--work-dir" - << QDir(projectDirectory.toString()).relativeFilePath( - buildConfiguration->buildDirectory().toString()); + << QDir(projectDirectory.toUrlishString()).relativeFilePath( + buildConfiguration->buildDirectory().toUrlishString()); } args << "exec" << executable(); if (!arguments.arguments().isEmpty()) diff --git a/src/plugins/haskell/stackbuildstep.cpp b/src/plugins/haskell/stackbuildstep.cpp index b7ba35fbb60..ac07541e07f 100644 --- a/src/plugins/haskell/stackbuildstep.cpp +++ b/src/plugins/haskell/stackbuildstep.cpp @@ -39,10 +39,10 @@ public: bool init() final { if (AbstractProcessStep::init()) { - const auto projectDir = QDir(project()->projectDirectory().toString()); + const auto projectDir = QDir(project()->projectDirectory().toUrlishString()); processParameters()->setCommandLine( {settings().stackPath(), - {"build", "--work-dir", projectDir.relativeFilePath(buildDirectory().toString())}}); + {"build", "--work-dir", projectDir.relativeFilePath(buildDirectory().toUrlishString())}}); processParameters()->setEnvironment(buildEnvironment()); } return true; diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index e06815ed930..e4c9028c277 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -223,7 +223,7 @@ void DocSettingsPageWidget::addDocumentation() NameSpaceToPathHash docsUnableToRegister; for (const FilePath &file : files) { - const QString filePath = file.cleanPath().toString(); + const QString filePath = file.cleanPath().toUrlishString(); const QString &nameSpace = HelpManager::namespaceFromFile(filePath); if (nameSpace.isEmpty()) { docsUnableToRegister.insert("UnknownNamespace", file.toUserOutput()); @@ -235,7 +235,7 @@ void DocSettingsPageWidget::addDocumentation() continue; } - m_model.insertEntry(createEntry(nameSpace, file.toString(), true /* user managed */)); + m_model.insertEntry(createEntry(nameSpace, file.toUrlishString(), true /* user managed */)); m_filesToRegister.insert(nameSpace, filePath); m_filesToRegisterUserManaged.insert(nameSpace, true/*user managed*/); diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index ae0a0eed3a8..80f5fa12edb 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -358,7 +358,7 @@ void GeneralSettingsPageWidget::importBookmarks() if (filePath.isEmpty()) return; - QFile file(filePath.toString()); + QFile file(filePath.toUrlishString()); if (file.open(QIODevice::ReadOnly)) { const BookmarkManager &manager = LocalHelpManager::bookmarkManager(); XbelReader reader(manager.treeBookmarkModel(), manager.listBookmarkModel()); diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index eee8f8fcd47..91b9ed4fdbb 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -94,7 +94,7 @@ HelpManager *HelpManager::instance() QString HelpManager::collectionFilePath() { - return ICore::userResourcePath("helpcollection.qhc").toString(); + return ICore::userResourcePath("helpcollection.qhc").toUrlishString(); } static void registerDocumentationNow(QPromise<bool> &promise, const QString &collectionFilePath, diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 1b70196a20a..dfbe746b106 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -155,7 +155,7 @@ HelpPluginPrivate::HelpPluginPrivate() if (!locale.isEmpty()) { auto qtr = new QTranslator(this); auto qhelptr = new QTranslator(this); - const QString creatorTrPath = ICore::resourcePath("translations").toString(); + const QString creatorTrPath = ICore::resourcePath("translations").toUrlishString(); const QString qtTrPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath); const QString trFile = QLatin1String("assistant_") + locale; const QString helpTrFile = QLatin1String("qt_help_") + locale; diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index bc8568cf80e..2e8a0e59756 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -149,7 +149,7 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url) if (!saver.hasError()) saver.write(helpEngine.fileData(resolvedUrl)); if (saver.finalize(Core::ICore::dialogParent())) - QDesktopServices::openUrl(QUrl(saver.filePath().toString())); + QDesktopServices::openUrl(QUrl(saver.filePath().toUrlishString())); return true; } return false; diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm index 68cfa56debf..c62ee3d7773 100644 --- a/src/plugins/help/macwebkithelpviewer.mm +++ b/src/plugins/help/macwebkithelpviewer.mm @@ -575,7 +575,7 @@ void MacWebKitHelpViewer::setHtml(const QString &html) [m_widget->webView().mainFrame loadHTMLString:html.toNSString() baseURL:[NSURL - fileURLWithPath:Core::ICore::resourcePath().toString().toNSString()]]; + fileURLWithPath:Core::ICore::resourcePath().toUrlishString().toNSString()]]; } } diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 7758754562d..177b6fa67d3 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -81,7 +81,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, if (!filePath.isReadableFile()) return OpenResult::ReadError; - const QString &fileName = filePath.toString(); + const QString &fileName = filePath.toUrlishString(); QByteArray format = QImageReader::imageFormat(fileName); // if it is impossible to recognize a file format - file will not be open correctly if (format.isEmpty()) { @@ -176,7 +176,7 @@ QGraphicsItem *ImageViewerFile::createGraphicsItem() const val = m_tempSvgItem; m_tempSvgItem = nullptr; } else { - val = new QGraphicsSvgItem(filePath().toString()); + val = new QGraphicsSvgItem(filePath().toUrlishString()); } #endif break; diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp index c7e18b8fe1b..5cea2cce16e 100644 --- a/src/plugins/imageviewer/multiexportdialog.cpp +++ b/src/plugins/imageviewer/multiexportdialog.cpp @@ -235,7 +235,7 @@ void MultiExportDialog::suggestSizes() QVector<ExportData> MultiExportDialog::exportData() const { const QVector<QSize> sizeList = sizes(); - const QString pattern = exportFileName().toString(); + const QString pattern = exportFileName().toUrlishString(); QVector<ExportData> result; result.reserve(sizeList.size()); for (const QSize &s : sizeList) diff --git a/src/plugins/incredibuild/cmakecommandbuilder.cpp b/src/plugins/incredibuild/cmakecommandbuilder.cpp index 7743b3143fd..3c8c8d4ab16 100644 --- a/src/plugins/incredibuild/cmakecommandbuilder.cpp +++ b/src/plugins/incredibuild/cmakecommandbuilder.cpp @@ -43,7 +43,7 @@ QString CMakeCommandBuilder::defaultArguments() const QString buildDir; BuildConfiguration *buildConfig = buildStep()->buildConfiguration(); if (buildConfig) - buildDir = buildConfig->buildDirectory().toString(); + buildDir = buildConfig->buildDirectory().toUrlishString(); if (buildDir.isEmpty()) buildDir = "."; diff --git a/src/plugins/insight/insightmodel.cpp b/src/plugins/insight/insightmodel.cpp index 3a4d03124ce..fb0fbb1e047 100644 --- a/src/plugins/insight/insightmodel.cpp +++ b/src/plugins/insight/insightmodel.cpp @@ -657,7 +657,7 @@ void InsightModel::parseDefaultConfig() const QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target->kit()); if (qtVersion) { - m_defaultConfig = readJSON(qtVersion->dataPath().toString() + "/" + dataFolder + "/" + m_defaultConfig = readJSON(qtVersion->dataPath().toUrlishString() + "/" + dataFolder + "/" + insightConfFile); } } diff --git a/src/plugins/insight/insightwidget.cpp b/src/plugins/insight/insightwidget.cpp index 03a46b03443..cfb573be34b 100644 --- a/src/plugins/insight/insightwidget.cpp +++ b/src/plugins/insight/insightwidget.cpp @@ -40,7 +40,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } InsightWidget::InsightWidget(InsightView *insightView, InsightModel *insightModel) @@ -80,7 +80,7 @@ QString InsightWidget::qmlSourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/insight"; #endif - return Core::ICore::resourcePath("qmldesigner/insight").toString(); + return Core::ICore::resourcePath("qmldesigner/insight").toUrlishString(); } void InsightWidget::showEvent(QShowEvent *event) diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index bc3fdc29801..76ccc6a7bdb 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -219,8 +219,8 @@ QStringList IosBuildStep::defaultArguments() const res << gtc->platformCodeGenFlags(); } if (!SysRootKitAspect::sysRoot(kit).isEmpty()) - res << "-sdk" << SysRootKitAspect::sysRoot(kit).toString(); - res << "SYMROOT=" + buildDirectory().toString(); + res << "-sdk" << SysRootKitAspect::sysRoot(kit).toUrlishString(); + res << "SYMROOT=" + buildDirectory().toUrlishString(); return res; } diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 6fd35cb6234..b842e6955e9 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -203,7 +203,7 @@ static QVersionNumber findXcodeVersion(const FilePath &developerPath) { const FilePath xcodeInfo = developerPath.parentDir().pathAppended("Info.plist"); if (xcodeInfo.exists()) { - QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat); + QSettings settings(xcodeInfo.toUrlishString(), QSettings::NativeFormat); return QVersionNumber::fromString(settings.value("CFBundleShortVersionString").toString()); } else { qCDebug(iosCommonLog) << "Error finding Xcode version." << xcodeInfo.toUserOutput() << diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index e9825fb6ce1..8da137e935c 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -297,7 +297,7 @@ bool IosDeployStep::checkProvisioningProfile() if (!provisioningFilePath.exists()) return true; - QFile provisionFile(provisioningFilePath.toString()); + QFile provisionFile(provisioningFilePath.toUrlishString()); if (!provisionFile.open(QIODevice::ReadOnly)) return true; diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index 8753f7062ea..2da029bfe76 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -211,7 +211,7 @@ QWidget *IosDsymBuildStep::createConfigWidget() auto commandLabel = new QLabel(Tr::tr("Command:"), widget); auto commandLineEdit = new QLineEdit(widget); - commandLineEdit->setText(command().toString()); + commandLineEdit->setText(command().toUrlishString()); auto argumentsTextEdit = new QPlainTextEdit(widget); argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments())); @@ -256,7 +256,7 @@ QWidget *IosDsymBuildStep::createConfigWidget() [this, commandLineEdit, resetDefaultsButton, argumentsTextEdit, updateDetails] { setCommand(defaultCommand()); setArguments(defaultArguments()); - commandLineEdit->setText(command().toString()); + commandLineEdit->setText(command().toUrlishString()); argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments())); resetDefaultsButton->setEnabled(!isDefault()); updateDetails(); diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 883263ae723..e6d6835f77f 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -93,7 +93,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath) + QString(QLatin1String("/Platforms/%1.platform/Developer/SDKs/%1.sdk")).arg( sdk.directoryName)); sdk.architectures = sdkConfig.second; - const QFileInfo sdkPathInfo(sdk.path.toString()); + const QFileInfo sdkPathInfo(sdk.path.toUrlishString()); if (sdkPathInfo.exists() && sdkPathInfo.isDir()) { clangProfile.sdks.push_back(sdk); allArchitectures += Utils::toSet(sdk.architectures); diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 9f836d4c6ac..ef328d2fae7 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -94,7 +94,7 @@ static void stopRunningRunControl(RunControl *runControl) static QString getBundleIdentifier(const FilePath &bundlePath) { - QSettings settings(bundlePath.pathAppended("Info.plist").toString(), QSettings::NativeFormat); + QSettings settings(bundlePath.pathAppended("Info.plist").toUrlishString(), QSettings::NativeFormat); return settings.value(QString::fromLatin1("CFBundleIdentifier")).toString(); } @@ -986,7 +986,7 @@ void IosDebugSupport::start() rp.setInferiorExecutable(data->localExecutable); setRemoteChannel("connect://localhost:" + gdbServerPort.toString()); - QString bundlePath = data->bundleDirectory.toString(); + QString bundlePath = data->bundleDirectory.toUrlishString(); bundlePath.chop(4); FilePath dsymPath = FilePath::fromString(bundlePath.append(".dSYM")); if (dsymPath.exists() diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 5f49d44e6a5..b7ab016013e 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -628,7 +628,7 @@ void IosDeviceToolHandlerPrivate::requestTransferApp(const FilePath &bundlePath, { m_bundlePath = bundlePath; m_deviceId = deviceId; - QString tmpDeltaPath = TemporaryDirectory::masterDirectoryFilePath().pathAppended("ios").toString(); + QString tmpDeltaPath = TemporaryDirectory::masterDirectoryFilePath().pathAppended("ios").toUrlishString(); QStringList args; args << QLatin1String("--id") << deviceId << QLatin1String("--bundle") << bundlePath.path() << QLatin1String("--timeout") << QString::number(timeout) @@ -941,7 +941,7 @@ bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::Res QString IosToolHandler::iosDeviceToolPath() { - return Core::ICore::libexecPath("ios/iostool").toString(); + return Core::ICore::libexecPath("ios/iostool").toUrlishString(); } IosToolHandler::IosToolHandler(const Internal::IosDeviceType &devType, QObject *parent) : diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 59c78e9f62d..eb58395c428 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -358,7 +358,7 @@ QString bundleIdentifier(const Utils::FilePath &bundlePath) QString bundleID; #ifdef Q_OS_MAC if (bundlePath.exists()) { - CFStringRef cFBundlePath = bundlePath.toString().toCFString(); + CFStringRef cFBundlePath = bundlePath.toUrlishString().toCFString(); CFURLRef bundle_url = CFURLCreateWithFileSystemPath (kCFAllocatorDefault, cFBundlePath, kCFURLPOSIXPathStyle, true); CFRelease(cFBundlePath); CFBundleRef bundle = CFBundleCreate (kCFAllocatorDefault, bundle_url); @@ -378,7 +378,7 @@ QString bundleExecutable(const Utils::FilePath &bundlePath) QString executable; #ifdef Q_OS_MAC if (bundlePath.exists()) { - CFStringRef cFBundlePath = bundlePath.toString().toCFString(); + CFStringRef cFBundlePath = bundlePath.toUrlishString().toCFString(); CFURLRef bundle_url = CFURLCreateWithFileSystemPath (kCFAllocatorDefault, cFBundlePath, kCFURLPOSIXPathStyle, true); CFRelease(cFBundlePath); CFBundleRef bundle = CFBundleCreate (kCFAllocatorDefault, bundle_url); @@ -475,7 +475,7 @@ void installApp(QPromise<SimulatorControl::Response> &promise, } expected_str<void> result - = runSimCtlCommand({"install", simUdid, bundlePath.toString()}, nullptr, [&promise] { + = runSimCtlCommand({"install", simUdid, bundlePath.toUrlishString()}, nullptr, [&promise] { return promise.isCanceled(); }); if (!result) { diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 26a7a860a76..f5e73eb0a4b 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -1121,7 +1121,7 @@ bool LanguageFilter::isSupported(const Utils::FilePath &filePath, const QString options); }); return Utils::anyOf(regexps, [filePath](const QRegularExpression ®){ - return reg.match(filePath.toString()).hasMatch() + return reg.match(filePath.toUrlishString()).hasMatch() || reg.match(filePath.fileName()).hasMatch(); }); } diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp index 71b41bbcbfa..624fc088839 100644 --- a/src/plugins/languageclient/languageclientsymbolsupport.cpp +++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp @@ -344,7 +344,7 @@ Utils::SearchResultItems generateSearchResultItems( } } if (renaming) { - userData.append(Utils::transform(fileRenameCandidates, &Utils::FilePath::toString)); + userData.append(Utils::transform(fileRenameCandidates, &Utils::FilePath::toUrlishString)); search->setUserData(userData); const auto extraWidget = qobject_cast<ReplaceWidget *>(search->additionalReplaceWidget()); extraWidget->updateCheckBox(fileRenameCandidates); diff --git a/src/plugins/lua/bindings/utils.cpp b/src/plugins/lua/bindings/utils.cpp index ca56340e9ba..63daf27ad7d 100644 --- a/src/plugins/lua/bindings/utils.cpp +++ b/src/plugins/lua/bindings/utils.cpp @@ -244,7 +244,7 @@ void setupUtilsModule() return QString("ProcessRunData{\n command=%1,\n workingDirectory=%2,\n " "environment={\n %3\n}\n}") .arg(prd.command.toUserOutput()) - .arg(prd.workingDirectory.toString()) + .arg(prd.workingDirectory.toUrlishString()) .arg(prd.environment.toStringList().join(",\n ")); }); diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index edf5d8cca89..986143db5d6 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -416,7 +416,7 @@ void MacroManager::saveLastMacro() QString MacroManager::macrosDirectory() { - const QString path = Core::ICore::userResourcePath("macros").toString(); + const QString path = Core::ICore::userResourcePath("macros").toUrlishString(); if (QFileInfo::exists(path) || QDir().mkpath(path)) return path; return QString(); diff --git a/src/plugins/mcusupport/mcubuildstep.cpp b/src/plugins/mcusupport/mcubuildstep.cpp index 706c3e6a2a8..f52e70c18fe 100644 --- a/src/plugins/mcusupport/mcubuildstep.cpp +++ b/src/plugins/mcusupport/mcubuildstep.cpp @@ -91,14 +91,14 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, I const Id importPathConstant = QtSupport::Constants::KIT_QML_IMPORT_PATH; const FilePath qulIncludeDir = FilePath::fromVariant(kit->value(importPathConstant)); QStringList includeDirs { - ProcessArgs::quoteArg(qulIncludeDir.toString()), - ProcessArgs::quoteArg(qulIncludeDir.pathAppended("Timeline").toString()), - ProcessArgs::quoteArg(qulIncludeDir.pathAppended("Shapes").toString()) + ProcessArgs::quoteArg(qulIncludeDir.toUrlishString()), + ProcessArgs::quoteArg(qulIncludeDir.pathAppended("Timeline").toUrlishString()), + ProcessArgs::quoteArg(qulIncludeDir.pathAppended("Shapes").toUrlishString()) }; const Id toolChainConstant = Internal::Constants::KIT_MCUTARGET_TOOLCHAIN_KEY; QStringList arguments = { - ProcessArgs::quoteArg(buildSystem()->projectFilePath().toString()), + ProcessArgs::quoteArg(buildSystem()->projectFilePath().toUrlishString()), "--platform", findKitInformation(kit, "QUL_PLATFORM"), "--toolchain", kit->value(toolChainConstant).toString(), "--include-dirs", includeDirs.join(","), diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp index a50f1d0135a..14d5e54c141 100644 --- a/src/plugins/mcusupport/mcukitmanager.cpp +++ b/src/plugins/mcusupport/mcukitmanager.cpp @@ -128,7 +128,7 @@ public: k->setDeviceTypeForIcon(DEVICE_TYPE); k->setValue(QtSupport::Constants::FLAGS_SUPPLIES_QTQUICK_IMPORT_PATH, true); // FIXME: This is treated as a pathlist in CMakeBuildSystem::updateQmlJSCodeModel - k->setValue(QtSupport::Constants::KIT_QML_IMPORT_PATH, (sdkPath / "include/qul").toString()); + k->setValue(QtSupport::Constants::KIT_QML_IMPORT_PATH, (sdkPath / "include/qul").toUrlishString()); k->setValue(QtSupport::Constants::KIT_HAS_MERGED_HEADER_PATHS_WITH_QML_IMPORT_PATHS, true); QSet<Id> irrelevant = { SysRootKitAspect::id(), @@ -278,9 +278,9 @@ public: if (!cxxToolchain->compilerCommand().isEmpty() && !cToolchain->compilerCommand().isEmpty()) { configMap.insert("CMAKE_CXX_COMPILER", - cxxToolchain->compilerCommand().toString().toLatin1()); + cxxToolchain->compilerCommand().toUrlishString().toLatin1()); configMap.insert("CMAKE_C_COMPILER", - cToolchain->compilerCommand().toString().toLatin1()); + cToolchain->compilerCommand().toUrlishString().toLatin1()); } } else { printMessage(Tr::tr("Warning for target %1: invalid toolchain path (%2). " @@ -300,7 +300,7 @@ public: const FilePath cMakeToolchainFile = mcuTarget->toolChainFilePackage()->path(); configMap.insert(Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE, - cMakeToolchainFile.toString().toUtf8()); + cMakeToolchainFile.toUrlishString().toUtf8()); if (!cMakeToolchainFile.exists()) { printMessage( Tr::tr("Warning for target %1: missing CMake toolchain file expected at %2.") @@ -312,7 +312,7 @@ public: const FilePath generatorsPath = qtForMCUsSdkPackage->path().pathAppended( "/lib/cmake/Qul/QulGenerators.cmake"); - configMap.insert("QUL_GENERATORS", generatorsPath.toString().toUtf8()); + configMap.insert("QUL_GENERATORS", generatorsPath.toUrlishString().toUtf8()); if (!generatorsPath.exists()) { printMessage(Tr::tr("Warning for target %1: missing QulGenerators expected at %2.") .arg(generateKitNameFromTarget(mcuTarget), diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index d2fce81409b..9eea28aab09 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -223,8 +223,8 @@ QString McuPackage::statusText() const : QString("%1 %2").arg(outDetectionPath, displayVersions); const QString displayDetectedPath = m_versions.empty() - ? m_usedDetectionPath.toString() - : QString("%1 %2").arg(m_usedDetectionPath.toString(), + ? m_usedDetectionPath.toUrlishString() + : QString("%1 %2").arg(m_usedDetectionPath.toUrlishString(), m_detectedVersion); QString response; diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 5967c4f4a60..54803fe9084 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -135,7 +135,7 @@ MacroExpanderPtr McuSdkRepository::getMacroExpander(const McuTarget &target) for (const auto &package : target.packages()) { macroExpander->registerVariable(package->cmakeVariableName().toLocal8Bit(), package->label(), - [package] { return package->path().toString(); }); + [package] { return package->path().toUrlishString(); }); } for (auto [key, macro] : asKeyValueRange(*globalMacros())) @@ -172,7 +172,7 @@ FilePath McuSupportOptions::qulDocsDir() const void McuSupportOptions::registerQchFiles() const { - const QString docsDir = qulDocsDir().toString(); + const QString docsDir = qulDocsDir().toUrlishString(); if (docsDir.isEmpty()) return; @@ -196,8 +196,8 @@ void McuSupportOptions::registerExamples() const continue; QtSupport::QtVersionManager::registerExampleSet(dir.second, - docsDir.toString(), - examplesDir.toString()); + docsDir.toUrlishString(), + examplesDir.toUrlishString()); } } diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 26214ea6c60..39082010da5 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -116,7 +116,7 @@ McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &settingsHandler, return FilePath::fromUserInput(qtcEnvironmentVariable(envVar)); if (!desc.boardSdk.defaultPath.isEmpty()) { FilePath defaultPath = FilePath::fromUserInput(QDir::rootPath() - + desc.boardSdk.defaultPath.toString()); + + desc.boardSdk.defaultPath.toUrlishString()); if (defaultPath.exists()) return defaultPath; } diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp index 79c12cc9b3f..7f82252f0ee 100644 --- a/src/plugins/mcusupport/mcusupportversiondetection.cpp +++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp @@ -71,7 +71,7 @@ McuPackageXmlVersionDetector::McuPackageXmlVersionDetector(const QString &filePa QString McuPackageXmlVersionDetector::parseVersion(const FilePath &packagePath) const { - const auto files = QDir(packagePath.toString(), m_filePattern).entryInfoList(); + const auto files = QDir(packagePath.toUrlishString(), m_filePattern).entryInfoList(); for (const auto &xmlFile : files) { QFile sdkXmlFile = QFile(xmlFile.absoluteFilePath()); sdkXmlFile.open(QFile::OpenModeFlag::ReadOnly); @@ -97,7 +97,7 @@ McuPackageDirectoryEntriesVersionDetector::McuPackageDirectoryEntriesVersionDete QString McuPackageDirectoryEntriesVersionDetector::parseVersion(const FilePath &packagePath) const { - const auto files = QDir(packagePath.toString(), m_filePattern).entryInfoList(); + const auto files = QDir(packagePath.toUrlishString(), m_filePattern).entryInfoList(); for (const auto &entry : files) { const QString matched = matchRegExp(entry.fileName(), m_versionRegExp); if (!matched.isEmpty()) @@ -114,7 +114,7 @@ QString McuPackagePathVersionDetector::parseVersion(const FilePath &packagePath) { if (!packagePath.exists()) return {}; - return matchRegExp(packagePath.toString(), m_versionRegExp); + return matchRegExp(packagePath.toUrlishString(), m_versionRegExp); } } // namespace Internal diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 4465f5a066d..f45fd668e6d 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -303,13 +303,13 @@ void verifyTargetToolchains(const Targets &targets, QVERIFY(toolchainFile); QCOMPARE(toolchainFile->cmakeVariableName(), TOOLCHAIN_FILE_CMAKE_VARIABLE); QCOMPARE(toolchainFile->settingsKey(), empty); - QCOMPARE(toolchainFile->path().toString(), toolchainFilePath); - QCOMPARE(toolchainFile->defaultPath().toString(), toolchainFileDefaultPath); + QCOMPARE(toolchainFile->path().toUrlishString(), toolchainFilePath); + QCOMPARE(toolchainFile->defaultPath().toUrlishString(), toolchainFileDefaultPath); const auto toolchainCompiler{target->toolChainPackage()}; QVERIFY(toolchainCompiler); QCOMPARE(toolchainCompiler->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); - QCOMPARE(toolchainCompiler->path().toString(), compilerPath); + QCOMPARE(toolchainCompiler->path().toUrlishString(), compilerPath); QCOMPARE(toolchainCompiler->settingsKey(), compilerSetting); QCOMPARE(toolchainCompiler->versions(), versions); } @@ -338,8 +338,8 @@ void verifyFreeRtosPackage(const McuPackagePtr &freeRtos, QCOMPARE(freeRtos->environmentVariableName(), envVar); QCOMPARE(freeRtos->cmakeVariableName(), freeRtosCMakeVar); QCOMPARE(freeRtos->settingsKey(), expectedSettingsKey); - QCOMPARE(freeRtos->path().cleanPath().toString(), freeRtosPath); - QCOMPARE(freeRtos->detectionPaths().first().cleanPath().toString(), freeRtosDetectionPath); + QCOMPARE(freeRtos->path().cleanPath().toUrlishString(), freeRtosPath); + QCOMPARE(freeRtos->detectionPaths().first().cleanPath().toUrlishString(), freeRtosDetectionPath); QVERIFY(freeRtos->path().toUserOutput().startsWith(boardSdkDir.cleanPath().toUserOutput())); } @@ -354,14 +354,14 @@ void verifyPackage(const McuPackagePtr &package, const QStringList &versions) { QVERIFY(package); - QCOMPARE(package->defaultPath().toString(), defaultPath); - QCOMPARE(package->path().toString(), path); + QCOMPARE(package->defaultPath().toUrlishString(), defaultPath); + QCOMPARE(package->path().toUrlishString(), path); QCOMPARE(package->cmakeVariableName(), cmakeVar); QCOMPARE(package->environmentVariableName(), envVar); QCOMPARE(package->label(), label); if (!detectionPath.isEmpty()) { QVERIFY(!package->detectionPaths().empty()); - QCOMPARE(package->detectionPaths().first().toString(), detectionPath); + QCOMPARE(package->detectionPaths().first().toUrlishString(), detectionPath); } QCOMPARE(package->settingsKey(), setting); QCOMPARE(package->versions(), versions); @@ -500,7 +500,7 @@ void McuSupportTest::init() { McuSdkRepository::globalMacros() ->insert("MCU_TESTING_FOLDER", - [dir = testing_output_dir.absoluteFilePath().toString()] { return dir; }); + [dir = testing_output_dir.absoluteFilePath().toUrlishString()] { return dir; }); qDebug() << __func__; } @@ -576,7 +576,7 @@ void McuSupportTest::test_parseToolchainFromJSON() QCOMPARE(toolchainFilePackage.label, QString{}); QCOMPARE(toolchainFilePackage.envVar, QString{}); QCOMPARE(toolchainFilePackage.cmakeVar, TOOLCHAIN_FILE_CMAKE_VARIABLE); - QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toString(), toolchainFileDefaultPath); + QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toUrlishString(), toolchainFileDefaultPath); } void McuSupportTest::test_legacy_createIarToolchain() @@ -860,7 +860,7 @@ void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAv McuToolchainPackage *toolchain = targetFactory.createToolchain(toolchainDescription); - QCOMPARE(toolchain->path().toString(), fallbackDir); + QCOMPARE(toolchain->path().toUrlishString(), fallbackDir); } void McuSupportTest::test_usePathFromSettingsForToolchainPath() @@ -884,7 +884,7 @@ void McuSupportTest::test_usePathFromSettingsForToolchainPath() .WillOnce(Return(FilePath{armGccDir})); // user scope settings McuToolchainPackage *toolchain = targetFactory.createToolchain(toolchainDescription); - QCOMPARE(toolchain->path().toString(), armGccDir); + QCOMPARE(toolchain->path().toUrlishString(), armGccDir); } void McuSupportTest::test_addNewKit() @@ -944,7 +944,7 @@ void McuSupportTest::test_legacy_createUnsupportedToolchainFilePackage() auto unsupportedToolchainFile = legacyTargetFactory.getToolchainFile(qtForMcuSdkPath, iar); QVERIFY(unsupportedToolchainFile); - QCOMPARE(unsupportedToolchainFile->path().toString(), unsupportedToolchainFilePath); + QCOMPARE(unsupportedToolchainFile->path().toUrlishString(), unsupportedToolchainFilePath); QCOMPARE(unsupportedToolchainFile->cmakeVariableName(), TOOLCHAIN_FILE_CMAKE_VARIABLE); } @@ -1189,8 +1189,8 @@ void McuSupportTest::test_legacy_createFreeRtosPackage() verifyFreeRtosPackage(freeRtos, targetDescription.freeRTOS.envVar, boardSdkDir, - expectedPath.toString(), - expectedDetectionPath.toString(), + expectedPath.toUrlishString(), + expectedDetectionPath.toUrlishString(), expectedSettingsKey); } @@ -1222,8 +1222,8 @@ void McuSupportTest::test_createFreeRtosPackage() verifyFreeRtosPackage(freeRtos, targetDescription.freeRTOS.envVar, boardSdkDir, - expectedPath.toString(), - expectedDetectionPath.toString(), + expectedPath.toUrlishString(), + expectedDetectionPath.toUrlishString(), expectedSettingsKey); } @@ -1267,7 +1267,7 @@ void McuSupportTest::test_legacy_createQtMCUsPackage() QCOMPARE(qtForMCUsSDK->detectionPaths(), {FilePath::fromUserInput(Legacy::Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH) .withExecutableSuffix()}); - QCOMPARE(qtForMCUsSDK->path().toString(), qtForMcuSdkPath); + QCOMPARE(qtForMCUsSDK->path().toUrlishString(), qtForMcuSdkPath); } void McuSupportTest::test_legacy_supportMultipleToolchainVersions() @@ -1445,7 +1445,7 @@ void McuSupportTest::test_resolveEnvironmentVariablesInDefaultPath() }); QVERIFY(qtForMCUPkg); - QCOMPARE(qtForMCUPkg->path().toString(), qtForMcuSdkPath); + QCOMPARE(qtForMCUPkg->path().toUrlishString(), qtForMcuSdkPath); auto toolchainFilePkg = findOrDefault(packages, [](const McuPackagePtr &pkg) { return (pkg->cmakeVariableName() == TOOLCHAIN_FILE_CMAKE_VARIABLE); @@ -1454,9 +1454,9 @@ void McuSupportTest::test_resolveEnvironmentVariablesInDefaultPath() QVERIFY(toolchainFilePkg); QVERIFY(targets.size() == 1); - QCOMPARE(toolchainFilePkg->path().toString(), toolchainFilePath); - QVERIFY(toolchainFilePkg->path().toString().startsWith(qtForMcuSdkPath)); - QCOMPARE(toolchainFilePkg->defaultPath().toString(), toolchainFileDefaultPath); + QCOMPARE(toolchainFilePkg->path().toUrlishString(), toolchainFilePath); + QVERIFY(toolchainFilePkg->path().toUrlishString().startsWith(qtForMcuSdkPath)); + QCOMPARE(toolchainFilePkg->defaultPath().toUrlishString(), toolchainFileDefaultPath); Utils::Environment::modifySystemEnvironment( {{QUL_ENV_VAR, qtForMcuSdkPath, EnvironmentItem::Unset}}); @@ -1480,7 +1480,7 @@ void McuSupportTest::test_resolveCmakeVariablesInDefaultPath() }); QVERIFY(qtForMCUPkg); - QCOMPARE(qtForMCUPkg->path().toString(), qtForMcuSdkPath); + QCOMPARE(qtForMCUPkg->path().toUrlishString(), qtForMcuSdkPath); auto toolchainFilePkg = findOrDefault(packages, [](const McuPackagePtr &pkg) { return (pkg->cmakeVariableName() == TOOLCHAIN_FILE_CMAKE_VARIABLE); @@ -1489,9 +1489,9 @@ void McuSupportTest::test_resolveCmakeVariablesInDefaultPath() QVERIFY(toolchainFilePkg); QVERIFY(targets.size() == 1); - QCOMPARE(toolchainFilePkg->path().toString(), toolchainFilePath); - QVERIFY(toolchainFilePkg->path().toString().startsWith(qtForMcuSdkPath)); - QCOMPARE(toolchainFilePkg->defaultPath().toString(), toolchainFileDefaultPath); + QCOMPARE(toolchainFilePkg->path().toUrlishString(), toolchainFilePath); + QVERIFY(toolchainFilePkg->path().toUrlishString().startsWith(qtForMcuSdkPath)); + QCOMPARE(toolchainFilePkg->defaultPath().toUrlishString(), toolchainFileDefaultPath); } void McuSupportTest::test_legacy_createThirdPartyPackage_data() @@ -1717,10 +1717,10 @@ void McuSupportTest::test_createJLink3rdPartyPackage() void McuSupportTest::test_differentValueForEachOperationSystem() { const auto packageDescription = parseDescriptionJson(armgcc_mimxrt1050_evk_freertos_json); - auto default_path_entry = packageDescription.platform.entries[0].defaultPath.toString(); + auto default_path_entry = packageDescription.platform.entries[0].defaultPath.toUrlishString(); QCOMPARE(packageDescription.platform.entries[0].detectionPaths.size(), 1); auto validation_path_entry - = packageDescription.platform.entries[0].detectionPaths.first().toString(); + = packageDescription.platform.entries[0].detectionPaths.first().toUrlishString(); //TODO: Revisit whether this test is required and not currently covered by the third party packages if (HostOsInfo::isWindowsHost()) { diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 64d3f322828..d9a3c3e0e11 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -33,7 +33,7 @@ void CommitEditor::setFields(const FilePath &repositoryRoot, const QString &bran if (!mercurialWidget) return; - mercurialWidget->setFields(repositoryRoot.absoluteFilePath().toString(), branch, userName, email); + mercurialWidget->setFields(repositoryRoot.absoluteFilePath().toUrlishString(), branch, userName, email); fileModel = new SubmitFileModel(this); fileModel->setRepositoryRoot(repositoryRoot.absoluteFilePath()); diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index c4e3be177e0..997ea0b514f 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -93,7 +93,7 @@ bool MercurialClient::manifestSync(const FilePath &repository, const QString &re const CommandResult result = vcsSynchronousExec(repository, args); - const QDir repositoryDir(repository.toString()); + const QDir repositoryDir(repository.toUrlishString()); const QFileInfo needle = QFileInfo(repositoryDir, relativeFilename); const QStringList files = result.cleanedStdOut().split(QLatin1Char('\n')); @@ -141,7 +141,7 @@ bool MercurialClient::synchronousClone(const FilePath &workingDirectory, return vcsSynchronousExec(workingDirectory, QStringList{"update"}, flags).result() == ProcessResult::FinishedWithSuccess; } else { - const QStringList arguments{"clone", dstLocation, workingDirectory.parentDir().toString()}; + const QStringList arguments{"clone", dstLocation, workingDirectory.parentDir().toUrlishString()}; return vcsSynchronousExec(workingDirectory.parentDir(), arguments, flags).result() == ProcessResult::FinishedWithSuccess; } @@ -264,7 +264,7 @@ void MercurialClient::incoming(const FilePath &repositoryRoot, const QString &re if (!repository.isEmpty()) args.append(repository); - QString id = repositoryRoot.toString(); + QString id = repositoryRoot.toUrlishString(); if (!repository.isEmpty()) id += QLatin1Char('/') + repository; @@ -285,7 +285,7 @@ void MercurialClient::outgoing(const FilePath &repositoryRoot) VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot, VcsBaseEditor::getCodec(repositoryRoot), - "outgoing", repositoryRoot.toString()); + "outgoing", repositoryRoot.toUrlishString()); enqueueJob(createCommand(repositoryRoot, editor), args, repositoryRoot); } @@ -313,20 +313,20 @@ void MercurialClient::showDiffEditor(const FilePath &workingDir, const QStringLi const QString title = Tr::tr("Mercurial Diff"); const FilePath sourceFile = VcsBaseEditor::getSource(workingDir, QString()); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) - + ".DiffRepo." + sourceFile.toString(); + + ".DiffRepo." + sourceFile.toUrlishString(); requestReload(documentId, sourceFile, title, workingDir, {"diff"}); } else if (files.size() == 1) { const QString &fileName = files.at(0); const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(fileName); const FilePath sourceFile = VcsBaseEditor::getSource(workingDir, fileName); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) - + ".DiffFile." + sourceFile.toString(); + + ".DiffFile." + sourceFile.toUrlishString(); requestReload(documentId, sourceFile, title, workingDir, {"diff", fileName}); } else { - const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(workingDir.toString()); + const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(workingDir.toUrlishString()); const FilePath sourceFile = VcsBaseEditor::getSource(workingDir, QString()); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) - + ".DiffFile." + workingDir.toString(); + + ".DiffFile." + workingDir.toUrlishString(); requestReload(documentId, sourceFile, title, workingDir, QStringList{"diff"} + files); } } diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 92d50bae398..e370f20987e 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -194,7 +194,7 @@ MercurialPluginPrivate::MercurialPluginPrivate() return repository.pathAppended(".hg/branch"); }); setTopicRefresher([](const FilePath &repository) { - return mercurialClient().branchQuerySync(repository.toString()); + return mercurialClient().branchQuerySync(repository.toUrlishString()); }); Core::Context context(Constants::MERCURIAL_CONTEXT); @@ -615,7 +615,7 @@ bool MercurialPluginPrivate::activateCommit() QStringList extraOptions; if (!commitEditor->committerInfo().isEmpty()) extraOptions << QLatin1String("-u") << commitEditor->committerInfo(); - mercurialClient().commit(m_submitRepository, files, editorFile->filePath().toString(), + mercurialClient().commit(m_submitRepository, files, editorFile->filePath().toUrlishString(), extraOptions); } return true; @@ -747,7 +747,7 @@ bool MercurialPluginPrivate::sccManaged(const QString &filename) const bool managed = managesDirectory(FilePath::fromString(fi.absolutePath()), &topLevel); if (!managed || topLevel.isEmpty()) return false; - const QDir topLevelDir(topLevel.toString()); + const QDir topLevelDir(topLevel.toUrlishString()); return mercurialClient().manifestSync(topLevel, topLevelDir.relativeFilePath(filename)); } diff --git a/src/plugins/mercurial/srcdestdialog.cpp b/src/plugins/mercurial/srcdestdialog.cpp index 1e4f0b76b9b..bc0fc82f397 100644 --- a/src/plugins/mercurial/srcdestdialog.cpp +++ b/src/plugins/mercurial/srcdestdialog.cpp @@ -103,7 +103,7 @@ QString SrcDestDialog::getRepositoryString() const return repoUrl.toString(); } if (m_localButton->isChecked()) - return m_localPathChooser->filePath().toString(); + return m_localPathChooser->filePath().toUrlishString(); return m_urlLineEdit->text(); } @@ -115,8 +115,8 @@ FilePath SrcDestDialog::workingDir() const QUrl SrcDestDialog::getRepoUrl() const { // Repo to use: Default to the project repo, but use the current - const QString projectLoc = m_state.currentProjectPath().toString(); - const QString fileLoc = m_state.currentFileTopLevel().toString(); + const QString projectLoc = m_state.currentProjectPath().toUrlishString(); + const QString fileLoc = m_state.currentFileTopLevel().toUrlishString(); m_workingdir = projectLoc; if (!fileLoc.isEmpty()) m_workingdir = fileLoc; diff --git a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp index 249a6b23b63..303c37e481b 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp +++ b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp @@ -281,7 +281,7 @@ QStringList MesonBuildSystem::configArgs(bool isSetup) if (!isSetup || params.contains("--cross-file") || params.contains("--native-file")) return m_pendingConfigArgs + bc->mesonConfigArgs(); - return QStringList{QString("--native-file=%1").arg(machineFile(kit()).toString())} + return QStringList{QString("--native-file=%1").arg(machineFile(kit()).toUrlishString())} + m_pendingConfigArgs + bc->mesonConfigArgs(); } diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp index 7affdf1e007..a0010e131e4 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp @@ -83,7 +83,7 @@ static std::unique_ptr<MesonProjectNode> buildTree( } for (FilePath bsFile : bsFiles) { if (!bsFile.toFileInfo().isAbsolute()) - bsFile = srcDir.pathAppended(bsFile.toString()); + bsFile = srcDir.pathAppended(bsFile.toUrlishString()); root->addNestedNode(std::make_unique<FileNode>(bsFile, FileType::Project)); } return root; @@ -140,7 +140,7 @@ static QStringList toAbsolutePath(const FilePath &refPath, QStringList &pathList std::cbegin(pathList), std::cend(pathList), std::back_inserter(allAbs), - [refPath](const QString &path) { return refPath.resolvePath(path).toString(); }); + [refPath](const QString &path) { return refPath.resolvePath(path).toUrlishString(); }); return allAbs; } diff --git a/src/plugins/mesonprojectmanager/mesontools.cpp b/src/plugins/mesonprojectmanager/mesontools.cpp index 9dc928d56ce..606a6a40d3a 100644 --- a/src/plugins/mesonprojectmanager/mesontools.cpp +++ b/src/plugins/mesonprojectmanager/mesontools.cpp @@ -215,7 +215,7 @@ bool run_meson(const ProcessRunData &runData, QIODevice *output) bool isSetup(const FilePath &buildPath) { - return containsFiles(buildPath.pathAppended(Constants::MESON_INFO_DIR).toString(), + return containsFiles(buildPath.pathAppended(Constants::MESON_INFO_DIR).toUrlishString(), Constants::MESON_INTRO_TESTS, Constants::MESON_INTRO_TARGETS, Constants::MESON_INTRO_INSTALLED, @@ -265,7 +265,7 @@ static void ensureAutoDetected() if (std::optional<FilePath> path = findMeson()) { s_tools.emplace_back( std::make_shared<MesonToolWrapper>( - QString("System %1 at %2").arg("Meson").arg(path->toString()), *path, Id{}, true)); + QString("System %1 at %2").arg("Meson").arg(path->toUrlishString()), *path, Id{}, true)); } } diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h index 406c9f9457b..5754e3115c2 100644 --- a/src/plugins/mesonprojectmanager/target.h +++ b/src/plugins/mesonprojectmanager/target.h @@ -82,8 +82,8 @@ struct Target { auto relative_path = Utils::FilePath::fromString(target.definedIn).canonicalPath().relativeChildPath(projectDir.canonicalPath()).parentDir(); if (target.type == Type::sharedModule) - return relative_path.pathAppended(Utils::FilePath::fromString(target.fileName[0]).fileName()).toString(); - return relative_path.pathAppended(target.name).toString(); + return relative_path.pathAppended(Utils::FilePath::fromString(target.fileName[0]).fileName()).toUrlishString(); + return relative_path.pathAppended(target.name).toUrlishString(); } Target(const QString &type, diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp index cb98ca21edd..fc992b77431 100644 --- a/src/plugins/modeleditor/componentviewcontroller.cpp +++ b/src/plugins/modeleditor/componentviewcontroller.cpp @@ -166,7 +166,7 @@ void UpdateIncludeDependenciesVisitor::visitMComponent(qmt::MComponent *componen includeFilePath = includes.at(0).resolvedFileName(); } } - qmt::MComponent *includeComponent = findComponentFromFilePath(includeFilePath.toString()); + qmt::MComponent *includeComponent = findComponentFromFilePath(includeFilePath.toUrlishString()); if (includeComponent && includeComponent != component) { // add dependency between components if (!m_modelUtilities->haveDependency(component, includeComponent)) { @@ -223,7 +223,7 @@ void UpdateIncludeDependenciesVisitor::collectElementPaths(const ProjectExplorer QFileInfo fileInfo = fileNode->filePath().toFileInfo(); QString nodePath = fileInfo.path(); QStringList elementsPath = qmt::NameController::buildElementsPath(FilePath::fromString(nodePath), false); - filePathsMap->insert(elementName, Node(fileNode->filePath().toString(), elementsPath)); + filePathsMap->insert(elementName, Node(fileNode->filePath().toUrlishString(), elementsPath)); }); folderNode->forEachFolderNode([&](FolderNode *subNode) { collectElementPaths(subNode, filePathsMap); diff --git a/src/plugins/modeleditor/editordiagramview.cpp b/src/plugins/modeleditor/editordiagramview.cpp index 3949d25e61a..ae88d394257 100644 --- a/src/plugins/modeleditor/editordiagramview.cpp +++ b/src/plugins/modeleditor/editordiagramview.cpp @@ -67,7 +67,7 @@ void EditorDiagramView::dropProjectExplorerNodes(const QList<QVariant> &values, auto folderNode = dynamic_cast<ProjectExplorer::FolderNode *>(node); if (folderNode) { d->pxNodeController->addFileSystemEntry( - folderNode->filePath().toString(), -1, -1, + folderNode->filePath().toUrlishString(), -1, -1, diagramSceneModel()->findTopmostElement(scenePos), scenePos, diagramSceneModel()->diagram()); } @@ -80,7 +80,7 @@ void EditorDiagramView::dropFiles(const QList<Utils::DropSupport::FileSpec> &fil for (const auto &fileSpec : files) { QPointF scenePos = mapToScene(pos); d->pxNodeController->addFileSystemEntry( - fileSpec.filePath.toString(), fileSpec.line, fileSpec.column, + fileSpec.filePath.toUrlishString(), fileSpec.line, fileSpec.column, diagramSceneModel()->findTopmostElement(scenePos), scenePos, diagramSceneModel()->diagram()); } diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 391e30441df..9b4f044d6c3 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -323,7 +323,7 @@ void ModelIndexer::scanProject(Project *project) if (modelMimeType.isValid()) { for (const FilePath &file : files) { if (modelMimeType.suffixes().contains(file.completeSuffix())) { - QueuedFile queuedFile(file.toString(), project, file.lastModified()); + QueuedFile queuedFile(file.toUrlishString(), project, file.lastModified()); filesQueue.append(queuedFile); filesSet.insert(queuedFile); } @@ -391,7 +391,7 @@ QString ModelIndexer::findFirstModel(FolderNode *folderNode, const MimeType &mim return suffixes.contains(fn->filePath().completeSuffix()); }); if (foundFileNode) - return foundFileNode->filePath().toString(); + return foundFileNode->filePath().toUrlishString(); QString modelFileName; folderNode->findChildFolderNode([&](FolderNode *fn) { @@ -406,7 +406,7 @@ void ModelIndexer::forgetProject(Project *project) const FilePaths files = project->files(Project::SourceFiles); for (const FilePath &file : files) { - const QString fileString = file.toString(); + const QString fileString = file.toUrlishString(); // remove file from queue QueuedFile queuedFile(fileString, project); if (d->queuedFilesSet.remove(queuedFile)) { diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp index 5b8b27c8307..c04b8ff8bff 100644 --- a/src/plugins/modeleditor/pxnodeutilities.cpp +++ b/src/plugins/modeleditor/pxnodeutilities.cpp @@ -51,10 +51,10 @@ QString PxNodeUtilities::calcRelativePath(const ProjectExplorer::Node *node, { const QString nodePath = node->asFileNode() ? node->filePath().toFileInfo().path() - : node->filePath().toString(); + : node->filePath().toUrlishString(); return qmt::NameController::calcRelativePath(FilePath::fromString(nodePath), - FilePath::fromString(anchorFolder)).toString(); + FilePath::fromString(anchorFolder)).toUrlishString(); } QString PxNodeUtilities::calcRelativePath(const QString &filePath, const QString &anchorFolder) @@ -67,7 +67,7 @@ QString PxNodeUtilities::calcRelativePath(const QString &filePath, const QString else path = filePath; return qmt::NameController::calcRelativePath(FilePath::fromString(path), - FilePath::fromString(anchorFolder)).toString(); + FilePath::fromString(anchorFolder)).toUrlishString(); } qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath( diff --git a/src/plugins/nim/editor/nimcompletionassistprovider.cpp b/src/plugins/nim/editor/nimcompletionassistprovider.cpp index e290c8fb84d..c266e645f19 100644 --- a/src/plugins/nim/editor/nimcompletionassistprovider.cpp +++ b/src/plugins/nim/editor/nimcompletionassistprovider.cpp @@ -141,7 +141,7 @@ private: int line = 0, column = 0; Utils::Text::convertPosition(interface->textDocument(), pos, &line, &column); QTC_ASSERT(column >= 0, return nullptr); - return suggest->sug(interface->filePath().toString(), line, column, dirtyFile); + return suggest->sug(interface->filePath().toUrlishString(), line, column, dirtyFile); } static std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::AssistInterface *interface) diff --git a/src/plugins/nim/editor/nimtexteditorwidget.cpp b/src/plugins/nim/editor/nimtexteditorwidget.cpp index f7ca080dace..8bc6c5749e8 100644 --- a/src/plugins/nim/editor/nimtexteditorwidget.cpp +++ b/src/plugins/nim/editor/nimtexteditorwidget.cpp @@ -48,7 +48,7 @@ void NimTextEditorWidget::findLinkAt(const QTextCursor &c, const Utils::LinkHand int line = 0, column = 0; Utils::Text::convertPosition(document(), c.position(), &line, &column); - std::shared_ptr<NimSuggestClientRequest> request = suggest->def(path.toString(), + std::shared_ptr<NimSuggestClientRequest> request = suggest->def(path.toUrlishString(), line, column, dirtyFile->fileName()); diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp index b08a3f6dc04..f7b6fb4a7d0 100644 --- a/src/plugins/nim/project/nimblebuildsystem.cpp +++ b/src/plugins/nim/project/nimblebuildsystem.cpp @@ -104,7 +104,7 @@ NimbleBuildSystem::NimbleBuildSystem(Target *target) m_projectScanner.watchProjectFilePath(); connect(&m_projectScanner, &NimProjectScanner::fileChanged, this, [this](const QString &path) { - if (path == projectFilePath().toString()) + if (path == projectFilePath().toUrlishString()) requestDelayedParse(); }); @@ -117,7 +117,7 @@ NimbleBuildSystem::NimbleBuildSystem(Target *target) // Workaround for nimble creating temporary files in project root directory // when querying the list of tasks. // See https://github.com/nim-lang/nimble/issues/720 - if (directory != projectDirectory().toString()) + if (directory != projectDirectory().toUrlishString()) requestDelayedParse(); }); @@ -219,14 +219,14 @@ bool NimbleBuildSystem::supportsAction(Node *context, ProjectAction action, cons bool NimbleBuildSystem::addFiles(Node *, const FilePaths &filePaths, FilePaths *) { - return m_projectScanner.addFiles(Utils::transform(filePaths, &FilePath::toString)); + return m_projectScanner.addFiles(Utils::transform(filePaths, &FilePath::toUrlishString)); } RemovedFilesFromProject NimbleBuildSystem::removeFiles(Node *, const FilePaths &filePaths, FilePaths *) { - return m_projectScanner.removeFiles(Utils::transform(filePaths, &FilePath::toString)); + return m_projectScanner.removeFiles(Utils::transform(filePaths, &FilePath::toUrlishString)); } bool NimbleBuildSystem::deleteFiles(Node *, const FilePaths &) @@ -238,7 +238,7 @@ bool NimbleBuildSystem::renameFiles(Node *, const FilePairs &filesToRename, File { bool success = true; for (const auto &[oldFilePath, newFilePath] : filesToRename) { - if (!m_projectScanner.renameFile(oldFilePath.toString(), newFilePath.toString())) { + if (!m_projectScanner.renameFile(oldFilePath.toUrlishString(), newFilePath.toUrlishString())) { success = false; if (notRenamed) *notRenamed << oldFilePath; diff --git a/src/plugins/nim/project/nimbuildsystem.cpp b/src/plugins/nim/project/nimbuildsystem.cpp index b8425df69a2..91862171a2a 100644 --- a/src/plugins/nim/project/nimbuildsystem.cpp +++ b/src/plugins/nim/project/nimbuildsystem.cpp @@ -85,7 +85,7 @@ void NimProjectScanner::startScan() { m_scanner.setFilter( [excludedFiles = excludedFiles()](const Utils::MimeType &, const FilePath &fp) { - const QString path = fp.toString(); + const QString path = fp.toUrlishString(); return excludedFiles.contains(path) || path.endsWith(".nimproject") || path.contains(".nimproject.user") || path.contains(".nimble.user"); }); @@ -225,14 +225,14 @@ bool NimBuildSystem::supportsAction(Node *context, ProjectAction action, const N bool NimBuildSystem::addFiles(Node *, const FilePaths &filePaths, FilePaths *) { - return m_projectScanner.addFiles(Utils::transform(filePaths, &FilePath::toString)); + return m_projectScanner.addFiles(Utils::transform(filePaths, &FilePath::toUrlishString)); } RemovedFilesFromProject NimBuildSystem::removeFiles(Node *, const FilePaths &filePaths, FilePaths *) { - return m_projectScanner.removeFiles(Utils::transform(filePaths, &FilePath::toString)); + return m_projectScanner.removeFiles(Utils::transform(filePaths, &FilePath::toUrlishString)); } bool NimBuildSystem::deleteFiles(Node *, const FilePaths &) @@ -244,7 +244,7 @@ bool NimBuildSystem::renameFiles(Node *, const FilePairs &filesToRename, FilePat { bool success = true; for (const auto &[oldFilePath, newFilePath] : filesToRename) { - if (!m_projectScanner.renameFile(oldFilePath.toString(), newFilePath.toString())) { + if (!m_projectScanner.renameFile(oldFilePath.toUrlishString(), newFilePath.toUrlishString())) { success = false; if (notRenamed) *notRenamed << oldFilePath; diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index ce820926bed..9b724ecf058 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -86,10 +86,10 @@ QWidget *NimCompilerBuildStep::createConfigWidget() const FilePaths files = project()->files(Project::AllFiles); for (const FilePath &file : files) { if (file.endsWith(".nim")) - targetComboBox->addItem(file.fileName(), file.toString()); + targetComboBox->addItem(file.fileName(), file.toUrlishString()); } - const int index = targetComboBox->findData(m_targetNimFile.toString()); + const int index = targetComboBox->findData(m_targetNimFile.toUrlishString()); targetComboBox->setCurrentIndex(index); const QString text = m_userCompilerOptions.join(QChar::Space); @@ -135,7 +135,7 @@ void NimCompilerBuildStep::toMap(Store &map) const AbstractProcessStep::toMap(map); map[Constants::C_NIMCOMPILERBUILDSTEP_USERCOMPILEROPTIONS] = m_userCompilerOptions.join('|'); map[Constants::C_NIMCOMPILERBUILDSTEP_DEFAULTBUILDOPTIONS] = m_defaultOptions; - map[Constants::C_NIMCOMPILERBUILDSTEP_TARGETNIMFILE] = m_targetNimFile.toString(); + map[Constants::C_NIMCOMPILERBUILDSTEP_TARGETNIMFILE] = m_targetNimFile.toUrlishString(); } void NimCompilerBuildStep::setBuildType(BuildConfiguration::BuildType buildType) @@ -172,8 +172,8 @@ CommandLine NimCompilerBuildStep::commandLine() else if (m_defaultOptions == Debug) cmd.addArgs({"--debugInfo", "--lineDir:on"}); - cmd.addArg("--out:" + outFilePath().toString()); - cmd.addArg("--nimCache:" + bc->cacheDirectory().toString()); + cmd.addArg("--out:" + outFilePath().toUrlishString()); + cmd.addArg("--nimCache:" + bc->cacheDirectory().toUrlishString()); for (const QString &arg : std::as_const(m_userCompilerOptions)) { if (!arg.isEmpty()) @@ -181,7 +181,7 @@ CommandLine NimCompilerBuildStep::commandLine() } if (!m_targetNimFile.isEmpty()) - cmd.addArg(m_targetNimFile.toString()); + cmd.addArg(m_targetNimFile.toUrlishString()); return cmd; } diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp index cb497638b57..5de8a0b96de 100644 --- a/src/plugins/nim/project/nimcompilercleanstep.cpp +++ b/src/plugins/nim/project/nimcompilercleanstep.cpp @@ -86,7 +86,7 @@ bool NimCompilerCleanStep::removeCacheDirectory() QTC_ASSERT(bc, return false); if (!bc->cacheDirectory().exists()) return true; - QDir dir = QDir::fromNativeSeparators(bc->cacheDirectory().toString()); + QDir dir = QDir::fromNativeSeparators(bc->cacheDirectory().toUrlishString()); const QString dirName = dir.dirName(); if (!dir.cdUp()) return false; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 6ee2c1dc234..b1e0b6711a6 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -575,7 +575,7 @@ void PerforcePluginPrivate::revertCurrentFile() PerforceResponse result2 = runP4Cmd(state.currentFileTopLevel(), args, CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow); if (!result2.error) - emit filesChanged(QStringList(state.currentFile().toString())); + emit filesChanged(QStringList(state.currentFile().toUrlishString())); } void PerforcePluginPrivate::diffCurrentFile() @@ -716,7 +716,7 @@ void PerforcePluginPrivate::startSubmitProject() cleanCommitMessageFile(); return; } - m_commitMessageFileName = saver.filePath().toString(); + m_commitMessageFileName = saver.filePath().toUrlishString(); args.clear(); args << QLatin1String("files"); @@ -957,7 +957,7 @@ bool PerforcePluginPrivate::managesDirectoryFstat(const FilePath &directory) bool managed = false; do { // Quick check: Must be at or below top level and not "../../other_path" - const QString relativeDirArgs = settings().relativeToTopLevelArguments(directory.toString()); + const QString relativeDirArgs = settings().relativeToTopLevelArguments(directory.toUrlishString()); if (!relativeDirArgs.isEmpty() && relativeDirArgs.startsWith(QLatin1String(".."))) { if (!settings().defaultEnv()) break; @@ -1213,11 +1213,11 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const FilePath &workingDir, VcsOutputWindow::appendError(Tr::tr("Perforce is not correctly configured.")); return {}; } - QStringList actualArgs = settings().commonP4Arguments(workingDir.toString()); + QStringList actualArgs = settings().commonP4Arguments(workingDir.toUrlishString()); QString errorMessage; std::shared_ptr<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage); if (tempFile) - actualArgs << QLatin1String("-x") << tempFile->filePath().toString(); + actualArgs << QLatin1String("-x") << tempFile->filePath().toUrlishString(); else if (!errorMessage.isEmpty()) return {}; @@ -1517,7 +1517,7 @@ void PerforcePluginPrivate::setTopLevel(const FilePath &topLevel) if (settings().topLevel() == topLevel) return; - settings().setTopLevel(topLevel.toString()); + settings().setTopLevel(topLevel.toUrlishString()); const QString msg = Tr::tr("Perforce repository: %1").arg(topLevel.toUserOutput()); VcsOutputWindow::appendSilently(msg); diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp index 8f02fea9e06..956230b0d31 100644 --- a/src/plugins/perfprofiler/perfdatareader.cpp +++ b/src/plugins/perfprofiler/perfdatareader.cpp @@ -386,7 +386,7 @@ void PerfDataReader::addTargetArguments(CommandLine *cmd, const RunControl *runC ProjectExplorer::Kit *kit = runControl->kit(); QTC_ASSERT(kit, return); ProjectExplorer::BuildConfiguration *buildConfig = runControl->target()->activeBuildConfiguration(); - QString buildDir = buildConfig ? buildConfig->buildDirectory().toString() : QString(); + QString buildDir = buildConfig ? buildConfig->buildDirectory().toUrlishString() : QString(); collectArguments(cmd, buildDir, kit); } diff --git a/src/plugins/perfprofiler/perfloaddialog.cpp b/src/plugins/perfprofiler/perfloaddialog.cpp index e1722b3a48e..b2dc64b8920 100644 --- a/src/plugins/perfprofiler/perfloaddialog.cpp +++ b/src/plugins/perfprofiler/perfloaddialog.cpp @@ -115,7 +115,7 @@ void PerfLoadDialog::chooseDefaults() m_kitChooser->setCurrentKitId(target->kit()->id()); if (auto *bc = target->activeBuildConfiguration()) - m_executableDirLineEdit->setText(bc->buildDirectory().toString()); + m_executableDirLineEdit->setText(bc->buildDirectory().toUrlishString()); } } // PerfProfiler::Internal diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 793a5a9ef77..46f7f8cf4dd 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -518,7 +518,7 @@ void PerfProfilerTool::gotoSourceLocation(QString filePath, int lineNumber, int QFileInfo fi(filePath); if (!fi.isAbsolute() || !fi.exists() || !fi.isReadable()) { - fi.setFile(m_fileFinder.findFile(filePath).constFirst().toString()); + fi.setFile(m_fileFinder.findFile(filePath).constFirst().toUrlishString()); if (!fi.exists() || !fi.isReadable()) return; } @@ -537,7 +537,7 @@ static Utils::FilePaths collectQtIncludePaths(const ProjectExplorer::Kit *kit) if (qt == nullptr) return Utils::FilePaths(); Utils::FilePaths paths{qt->headerPath()}; - QDirIterator dit(paths.first().toString(), QStringList(), QDir::Dirs | QDir::NoDotAndDotDot, + QDirIterator dit(paths.first().toUrlishString(), QStringList(), QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); while (dit.hasNext()) { dit.next(); diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 0fa590b7d9f..ef3415055ee 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -1203,7 +1203,7 @@ Abis Abi::abisOfBinary(const Utils::FilePath &path) while (!data.isEmpty()) { if ((getUint8(data, 58) != 0x60 || getUint8(data, 59) != 0x0a)) { - qWarning() << path.toString() << ": Thought it was an ar-file, but it is not!"; + qWarning() << path.toUrlishString() << ": Thought it was an ar-file, but it is not!"; break; } diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp index bb8af3e00ee..7eb81f49b3f 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp @@ -122,7 +122,7 @@ ProjectIntroPage *BaseProjectWizardDialog::introPage() const QString BaseProjectWizardDialog::uniqueProjectName(const FilePath &path) { - const QDir pathDir(path.toString()); + const QDir pathDir(path.toUrlishString()); //: File path suggestion for a new project. If you choose //: to translate it, make sure it is a valid path name without blanks //: and using only ascii chars. diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index ae8eeb83b78..dd61cf31988 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/src/plugins/projectexplorer/buildaspects.cpp @@ -163,7 +163,7 @@ FilePath BuildDirectoryAspect::fixupDir(const FilePath &dir) return dir; if (HostOsInfo::isWindowsHost() && !dir.startsWithDriveLetter()) return {}; - const QString dirString = dir.toString().toLower(); + const QString dirString = dir.toUrlishString().toLower(); const QStringList drives = Utils::transform(QDir::drives(), [](const QFileInfo &fi) { return fi.absoluteFilePath().toLower().chopped(1); }); diff --git a/src/plugins/projectexplorer/buildsystem.cpp b/src/plugins/projectexplorer/buildsystem.cpp index 55c74a4bc90..03ff1bc4c2f 100644 --- a/src/plugins/projectexplorer/buildsystem.cpp +++ b/src/plugins/projectexplorer/buildsystem.cpp @@ -381,7 +381,7 @@ QString BuildSystem::disabledReason(const QString &buildKey) const : Tr::tr("The project could not be fully parsed."); const FilePath projectFilePath = buildTarget(buildKey).projectFilePath; if (!projectFilePath.isEmpty() && !projectFilePath.exists()) - msg += '\n' + Tr::tr("The project file \"%1\" does not exist.").arg(projectFilePath.toString()); + msg += '\n' + Tr::tr("The project file \"%1\" does not exist.").arg(projectFilePath.toUrlishString()); return msg; } return {}; diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 5680e823227..b832a41b26a 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -273,7 +273,7 @@ QString CustomToolchain::mkspecs() const void CustomToolchain::toMap(Store &data) const { Toolchain::toMap(data); - data.insert(makeCommandKeyC, m_makeCommand.toString()); + data.insert(makeCommandKeyC, m_makeCommand.toUrlishString()); QStringList macros = Utils::transform<QList>(m_predefinedMacros, [](const Macro &m) { return QString::fromUtf8(m.toByteArray()); }); data.insert(predefinedMacrosKeyC, macros); data.insert(headerPathsKeyC, headerPathsList()); diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index e79a454b06e..07701766d87 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -219,7 +219,7 @@ static inline QString scriptWorkingDirectory(const std::shared_ptr<CustomWizardC const std::shared_ptr<CustomWizardParameters> &p) { if (p->filesGeneratorScriptWorkingDirectory.isEmpty()) - return ctx->targetPath.toString(); + return ctx->targetPath.toUrlishString(); QString path = p->filesGeneratorScriptWorkingDirectory; CustomWizardContext::replaceFields(ctx->replacements, &path); return path; @@ -280,7 +280,7 @@ bool CustomWizard::writeFiles(const GeneratedFiles &files, QString *errorMessage if (!generatedFile.filePath().isFile()) { *errorMessage = QString::fromLatin1("%1 failed to generate %2"). arg(d->m_parameters->filesGeneratorScript.back()). - arg(generatedFile.filePath().toString()); + arg(generatedFile.filePath().toUrlishString()); return false; } } @@ -310,7 +310,7 @@ GeneratedFiles CustomWizard::generateWizardFiles(QString *errorMessage) const } // Add the template files specified by the <file> elements. for (const CustomWizardFile &file : std::as_const(d->m_parameters->files)) - if (!createFile(file, d->m_parameters->directory, ctx->targetPath.toString(), context()->replacements, + if (!createFile(file, d->m_parameters->directory, ctx->targetPath.toUrlishString(), context()->replacements, &rc, errorMessage)) return {}; @@ -368,8 +368,8 @@ void CustomWizard::createWizards() QString errorMessage; QString verboseLog; - const QString templateDirName = ICore::resourcePath(templatePathC).toString(); - const QString userTemplateDirName = ICore::userResourcePath(templatePathC).toString(); + const QString templateDirName = ICore::resourcePath(templatePathC).toUrlishString(); + const QString userTemplateDirName = ICore::userResourcePath(templatePathC).toUrlishString(); const QDir templateDir(templateDirName); if (CustomWizardPrivate::verbose) diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp index a479627fa9a..7f8502126be 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp @@ -340,8 +340,8 @@ void CustomWizardFieldPage::cleanupPage() PathChooserData &ped = m_pathChoosers[i]; QString defaultText = ped.defaultText; CustomWizardContext::replaceFields(m_context->baseReplacements, &defaultText); - if (ped.pathChooser->filePath().toString() != ped.defaultText) - ped.userChange = ped.pathChooser->filePath().toString(); + if (ped.pathChooser->filePath().toUrlishString() != ped.defaultText) + ped.userChange = ped.pathChooser->filePath().toUrlishString(); else ped.userChange.clear(); } diff --git a/src/plugins/projectexplorer/deployablefile.cpp b/src/plugins/projectexplorer/deployablefile.cpp index 967058ec633..84dc4828af9 100644 --- a/src/plugins/projectexplorer/deployablefile.cpp +++ b/src/plugins/projectexplorer/deployablefile.cpp @@ -23,7 +23,7 @@ QString DeployableFile::remoteFilePath() const bool DeployableFile::isValid() const { - return !m_localFilePath.toString().isEmpty() && !m_remoteDir.isEmpty(); + return !m_localFilePath.toUrlishString().isEmpty() && !m_remoteDir.isEmpty(); } bool DeployableFile::isExecutable() const @@ -33,7 +33,7 @@ bool DeployableFile::isExecutable() const size_t qHash(const DeployableFile &d) { - return qHash(qMakePair(d.localFilePath().toString(), d.remoteDirectory())); + return qHash(qMakePair(d.localFilePath().toUrlishString(), d.remoteDirectory())); } } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 9789af02bc3..65c8b59d4bc 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -73,7 +73,7 @@ void DeployConfiguration::toMap(Store &map) const Store deployData; for (int i = 0; i < m_customDeploymentData.fileCount(); ++i) { const DeployableFile &f = m_customDeploymentData.fileAt(i); - deployData.insert(keyFromString(f.localFilePath().toString()), f.remoteDirectory()); + deployData.insert(keyFromString(f.localFilePath().toUrlishString()), f.remoteDirectory()); } map.insert(DEPLOYMENT_DATA, variantFromStore(deployData)); } diff --git a/src/plugins/projectexplorer/deploymentdata.cpp b/src/plugins/projectexplorer/deploymentdata.cpp index 28626babab0..dd8dc8428f7 100644 --- a/src/plugins/projectexplorer/deploymentdata.cpp +++ b/src/plugins/projectexplorer/deploymentdata.cpp @@ -51,9 +51,9 @@ bool DeploymentData::operator==(const DeploymentData &other) const QString DeploymentData::addFilesFromDeploymentFile(const FilePath &deploymentFilePath, const FilePath &sourceDir_) { - const QString sourceDir = sourceDir_.toString(); + const QString sourceDir = sourceDir_.toUrlishString(); const QString sourcePrefix = sourceDir.endsWith('/') ? sourceDir : sourceDir + '/'; - QFile deploymentFile(deploymentFilePath.toString()); + QFile deploymentFile(deploymentFilePath.toUrlishString()); QTextStream deploymentStream; QString deploymentPrefix; diff --git a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp index 367045b4717..5ce163e42f5 100644 --- a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp @@ -277,7 +277,7 @@ private: expander->registerVariable( varName("KeyFile"), varDescription(Tr::tr("Private key file (%1)")), [kit] { const IDevice::ConstPtr device = DeviceAspect::device(kit); - return device ? device->sshParameters().privateKeyFile.toString() : QString(); + return device ? device->sshParameters().privateKeyFile.toUrlishString() : QString(); }); expander ->registerVariable(varName("Name"), varDescription(Tr::tr("Device name (%1)")), [kit] { diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp index 70e6cf9e91f..f8e25422ae3 100644 --- a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp @@ -67,7 +67,7 @@ QStringList SshParameters::connectionOptions(const FilePath &binary) const args << "-o" << "BatchMode=" + batchModeEnabled; const bool isWindows = HostOsInfo::isWindowsHost() - && binary.toString().toLower().contains("/system32/"); + && binary.toUrlishString().toLower().contains("/system32/"); const bool useTimeout = (timeout != 0) && !isWindows; if (useTimeout) args << "-o" << "ConnectTimeout=" + QString::number(timeout); @@ -136,7 +136,7 @@ const QString getKeyFileFromEnvironment() const QString keyFile = qtcEnvironmentVariable("QTC_SSH_TEST_KEYFILE"); if (keyFile.isEmpty()) { if (qtcEnvironmentVariableIsSet("QTC_SSH_TEST_DEFAULTS")) - return defaultKeyFile.toString(); + return defaultKeyFile.toUrlishString(); } return keyFile; } diff --git a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp index f815ef058b4..c634967b801 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp @@ -74,10 +74,10 @@ void SshSettings::storeSettings(QtcSettings *settings) settings->setValue(connectionSharingKey(), sshSettings->useConnectionSharing); settings->setValue(connectionSharingTimeoutKey(), sshSettings->connectionSharingTimeOutInMinutes); - settings->setValue(sshFilePathKey(), sshSettings->sshFilePath.toString()); - settings->setValue(sftpFilePathKey(), sshSettings->sftpFilePath.toString()); - settings->setValue(askPassFilePathKey(), sshSettings->askpassFilePath.toString()); - settings->setValue(keygenFilePathKey(), sshSettings->keygenFilePath.toString()); + settings->setValue(sshFilePathKey(), sshSettings->sshFilePath.toUrlishString()); + settings->setValue(sftpFilePathKey(), sshSettings->sftpFilePath.toUrlishString()); + settings->setValue(askPassFilePathKey(), sshSettings->askpassFilePath.toUrlishString()); + settings->setValue(keygenFilePathKey(), sshSettings->keygenFilePath.toUrlishString()); } void SshSettings::setConnectionSharingEnabled(bool share) diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index c11e3c4bc64..54cdf3b8a03 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -166,7 +166,7 @@ void ExtraCompiler::compileIfDirty() ExtraCompiler::ContentProvider ExtraCompiler::fromFileProvider() const { const auto provider = [fileName = source()] { - QFile file(fileName.toString()); + QFile file(fileName.toUrlishString()); if (!file.open(QFile::ReadOnly | QFile::Text)) return QByteArray(); return file.readAll(); diff --git a/src/plugins/projectexplorer/fileinsessionfinder.cpp b/src/plugins/projectexplorer/fileinsessionfinder.cpp index d8df6c74306..6fb3d7f990f 100644 --- a/src/plugins/projectexplorer/fileinsessionfinder.cpp +++ b/src/plugins/projectexplorer/fileinsessionfinder.cpp @@ -54,7 +54,7 @@ FilePaths FileInSessionFinder::doFindFile(const FilePath &filePath) m_finder.setProjectFiles(allFiles); m_finderIsUpToDate = true; } - return m_finder.findFile(QUrl::fromLocalFile(filePath.toString())); + return m_finder.findFile(QUrl::fromLocalFile(filePath.toUrlishString())); } } // namespace Internal diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index c92b04a3736..fa224f258d9 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -2124,7 +2124,7 @@ QString GccToolchain::sysRoot() const if (m_subType == Clang) { if (const GccToolchain *parentTC = mingwToolchainFromId(m_parentToolchainId)) { const FilePath mingwCompiler = parentTC->compilerCommand(); - return mingwCompiler.parentDir().parentDir().toString(); + return mingwCompiler.parentDir().parentDir().toUrlishString(); } } return {}; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index 04022bf5d98..814a694b06e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -646,7 +646,7 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit) classes << (entry.extraInfo + "::" + entry.displayName); if (completion == Completion::Namespaces) { if (!project - || entry.filePath.startsWith(project->projectDirectory().toString())) { + || entry.filePath.startsWith(project->projectDirectory().toUrlishString())) { namespaces << entry.extraInfo; } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h index 3b1ffe8ebb3..7a54c257d29 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h @@ -195,7 +195,7 @@ private: { QString result; QTextStream out(&result); - out << "PathChooser{path:" << m_path.toString() + out << "PathChooser{path:" << m_path.toUrlishString() << "; base:" << m_basePath << "; historyId:" << m_historyId << "; kind:" << (int)Utils::PathChooser::ExistingDirectory diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp index 5410663ccab..d0bb4553b1f 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp @@ -43,7 +43,7 @@ bool JsonFilePage::validatePage() const FilePath target = dir.resolvePath(fileName()); - wizard()->setProperty("TargetPath", target.toString()); + wizard()->setProperty("TargetPath", target.toUrlishString()); return true; } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp index 18d90bca77c..fdd5b405276 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp @@ -44,7 +44,7 @@ void JsonProjectPage::initializePage() connect(ProjectTree::instance(), &ProjectTree::treeChanged, this, &JsonProjectPage::initUiForSubProject); } - setProjectName(uniqueProjectName(filePath().toString())); + setProjectName(uniqueProjectName(filePath().toUrlishString())); } bool JsonProjectPage::validatePage() @@ -87,8 +87,8 @@ bool JsonProjectPage::validatePage() const FilePath target = filePath().pathAppended(projectName()); - wiz->setProperty("ProjectDirectory", target.toString()); - wiz->setProperty("TargetPath", target.toString()); + wiz->setProperty("ProjectDirectory", target.toUrlishString()); + wiz->setProperty("TargetPath", target.toUrlishString()); return Utils::ProjectIntroPage::validatePage(); } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp index ac99455adb3..9e78d8b9355 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp @@ -281,7 +281,8 @@ void JsonSummaryPage::updateProjectData(FolderNode *node) m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant::fromValue(node)); m_wizard->setValue(Constants::PROJECT_ISSUBPROJECT, node ? true : false); m_wizard->setValue(Constants::PREFERRED_PROJECT_NODE, QVariant::fromValue(node)); - m_wizard->setValue(Constants::PREFERRED_PROJECT_NODE_PATH, node ? node->filePath().toString() : QString()); + m_wizard->setValue(Constants::PREFERRED_PROJECT_NODE_PATH, node ? +node->filePath().toUrlishString() : QString()); bool qtKeyWordsEnabled = true; if (ProjectTree::hasNode(node)) { const ProjectNode *projectNode = node->asProjectNode(); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index c8e1bde9bc0..cf303cb3a5f 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -514,7 +514,7 @@ void JsonWizard::openProjectForNode(Node *node) if (projFilePath && !Core::EditorManager::openEditor(projFilePath.value())) { auto errorMessage = Tr::tr("Failed to open an editor for \"%1\".") - .arg(QDir::toNativeSeparators(projFilePath.value().toString())); + .arg(QDir::toNativeSeparators(projFilePath.value().toUrlishString())); QMessageBox::warning(nullptr, Tr::tr("Cannot Open Project"), errorMessage); } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp index 2553c23c949..9d3e62b978e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp @@ -234,7 +234,7 @@ void ProjectExplorerTest::testJsonWizardsComboBox() static QString iconInsideResource(const QString &relativePathToIcon) { - return Core::ICore::resourcePath().resolvePath(relativePathToIcon).toString(); + return Core::ICore::resourcePath().resolvePath(relativePathToIcon).toUrlishString(); } void ProjectExplorerTest::testJsonWizardsIconList() diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index fbf7534ee6e..f101699d5b9 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -222,7 +222,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) if (path.isEmpty()) continue; - FilePath dir = FilePath::fromString(path.toString()); + FilePath dir = FilePath::fromString(path.toUrlishString()); if (!dir.exists()) { if (verbose()) verboseLog.append( @@ -240,11 +240,11 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) if (verbose()) verboseLog.append( Tr::tr("Checking \"%1\" for %2.") - .arg(QDir::toNativeSeparators(current.absolutePath().toString())) + .arg(QDir::toNativeSeparators(current.absolutePath().toUrlishString())) .arg(fileName) + "\n"); if (current.pathAppended(fileName).exists()) { - QFile configFile(current.pathAppended(fileName).toString()); + QFile configFile(current.pathAppended(fileName).toUrlishString()); configFile.open(QIODevice::ReadOnly); QJsonParseError error; const QByteArray fileData = configFile.readAll(); @@ -676,7 +676,7 @@ Wizard *JsonWizardFactory::runWizardImpl(const FilePath &path, Id platform, for (auto i = variables.constBegin(); i != variables.constEnd(); ++i) wizard->setValue(i.key(), i.value()); - wizard->setValue(QStringLiteral("InitialPath"), path.toString()); + wizard->setValue(QStringLiteral("InitialPath"), path.toUrlishString()); wizard->setValue(QStringLiteral("QmlProjectName"), qmlProjectName(path)); wizard->setValue(QStringLiteral("Platform"), platform.toString()); @@ -737,7 +737,7 @@ Wizard *JsonWizardFactory::runWizardImpl(const FilePath &path, Id platform, return f->canCreate(data.typeId); }); QTC_ASSERT(factory, continue); - JsonWizardGenerator *gen = factory->create(data.typeId, data.data, path.toString(), platform, variables); + JsonWizardGenerator *gen = factory->create(data.typeId, data.data, path.toUrlishString(), platform, variables); QTC_ASSERT(gen, continue); wizard->addGenerator(gen); @@ -873,7 +873,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const FilePath &base .compare("Themed", Qt::CaseInsensitive) == 0; setIcon(iconIsThemed ? themedIcon(iconPath) : strVal.isEmpty() ? QIcon() - : QIcon(iconPath.toString()), + : QIcon(iconPath.toUrlishString()), iconText); const QString fontIconName = data.value(QLatin1String(FONT_ICON_NAME_KEY)).toString(); @@ -886,12 +886,12 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const FilePath &base *errorMessage = Tr::tr("Image file \"%1\" not found.").arg(imagePath.toUserOutput()); return false; } - setDescriptionImage(imagePath.toString()); + setDescriptionImage(imagePath.toUrlishString()); } const FilePath detailsPage = baseDir.resolvePath(QString("detailsPage.qml")); if (detailsPage.exists()) - setDetailsPageQmlPath(detailsPage.toString()); + setDetailsPageQmlPath(detailsPage.toUrlishString()); setRequiredFeatures(Id::fromStringList(data.value(QLatin1String(REQUIRED_FEATURES_KEY)).toStringList())); m_preferredFeatures = Id::fromStringList(data.value(QLatin1String(SUGGESTED_FEATURES_KEY)).toStringList()); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp index f43f4048c54..e6d03b51832 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp @@ -94,7 +94,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::fileList(Utils::MacroExpander * int minDepth = std::numeric_limits<int>::max(); for (auto it = result.begin(); it != result.end(); ++it) { const Utils::FilePath relPath = it->filePath().relativePathFrom(projectDir); - it->setBinary(binaryPattern.match(relPath.toString()).hasMatch()); + it->setBinary(binaryPattern.match(relPath.toUrlishString()).hasMatch()); bool found = ProjectManager::canOpenProjectForMimeType(Utils::mimeTypeForFile(relPath)); if (found) { it->setAttributes(it->attributes() | Core::GeneratedFile::OpenProjectAttribute); diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 828e02eb084..e0ec1a97bae 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -142,7 +142,7 @@ Kit::Kit(const Store &data) d->m_unexpandedDisplayName.fromMap(data, DISPLAYNAME_KEY); d->m_fileSystemFriendlyName = data.value(FILESYSTEMFRIENDLYNAME_KEY).toString(); - d->m_iconPath = FilePath::fromString(data.value(ICON_KEY, d->m_iconPath.toString()).toString()); + d->m_iconPath = FilePath::fromString(data.value(ICON_KEY, d->m_iconPath.toUrlishString()).toString()); d->m_deviceTypeForIcon = Id::fromSetting(data.value(DEVICE_TYPE_FOR_ICON_KEY)); if (const auto it = data.constFind(RELEVANT_ASPECTS_KEY); it != data.constEnd()) d->m_relevantAspects = transform<QSet<Id>>(it.value().toList(), &Id::fromSetting); @@ -370,7 +370,7 @@ QIcon Kit::icon() const return d->m_cachedIcon; if (!d->m_deviceTypeForIcon.isValid() && !d->m_iconPath.isEmpty() && d->m_iconPath.exists()) { - d->m_cachedIcon = QIcon(d->m_iconPath.toString()); + d->m_cachedIcon = QIcon(d->m_iconPath.toUrlishString()); return d->m_cachedIcon; } @@ -509,7 +509,7 @@ Store Kit::toMap() const data.insert(FILESYSTEMFRIENDLYNAME_KEY, d->m_fileSystemFriendlyName); data.insert(AUTODETECTIONSOURCE_KEY, d->m_autoDetectionSource); data.insert(SDK_PROVIDED_KEY, d->m_sdkProvided); - data.insert(ICON_KEY, d->m_iconPath.toString()); + data.insert(ICON_KEY, d->m_iconPath.toUrlishString()); data.insert(DEVICE_TYPE_FOR_ICON_KEY, d->m_deviceTypeForIcon.toSetting()); QStringList mutableInfo; diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 156345a1ec5..6d1bb9b70fe 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -301,7 +301,7 @@ void KitManagerConfigWidget::setIcon() Tr::tr("Images (*.png *.xpm *.jpg)")); if (path.isEmpty()) return; - const QIcon icon(path.toString()); + const QIcon icon(path.toUrlishString()); if (icon.isNull()) return; m_iconButton->setIcon(icon); diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index ab4d75521f3..28f23226971 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -1745,7 +1745,7 @@ static Key llvmDirKey() void ClangClToolchain::toMap(Store &data) const { MsvcToolchain::toMap(data); - data.insert(llvmDirKey(), m_clangPath.toString()); + data.insert(llvmDirKey(), m_clangPath.toUrlishString()); } void ClangClToolchain::fromMap(const Store &data) diff --git a/src/plugins/projectexplorer/parseissuesdialog.cpp b/src/plugins/projectexplorer/parseissuesdialog.cpp index 74c985245a0..8a62e4a8244 100644 --- a/src/plugins/projectexplorer/parseissuesdialog.cpp +++ b/src/plugins/projectexplorer/parseissuesdialog.cpp @@ -53,7 +53,7 @@ ParseIssuesDialog::ParseIssuesDialog(QWidget *parent) : QDialog(parent), d(new P const FilePath filePath = FileUtils::getOpenFilePath(Tr::tr("Choose File")); if (filePath.isEmpty()) return; - QFile file(filePath.toString()); + QFile file(filePath.toUrlishString()); if (!file.open(QIODevice::ReadOnly)) { QMessageBox::critical(this, Tr::tr("Could Not Open File"), Tr::tr("Could not open file: \"%1\": %2") diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 32c0127f055..25e712b66bc 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -804,7 +804,7 @@ void Project::changeRootProjectDirectory() | QFileDialog::DontResolveSymlinks); if (rootPath != d->m_rootProjectDirectory) { d->m_rootProjectDirectory = rootPath; - setNamedSettings(Constants::PROJECT_ROOT_PATH_KEY, d->m_rootProjectDirectory.toString()); + setNamedSettings(Constants::PROJECT_ROOT_PATH_KEY, d->m_rootProjectDirectory.toUrlishString()); emit rootProjectDirectoryChanged(); } } @@ -1359,7 +1359,7 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix, if (const RunConfiguration *const rc = rcGetter()) { if (const auto wdAspect = rc->aspect<WorkingDirectoryAspect>()) - return wdAspect->workingDirectory().toString(); + return wdAspect->workingDirectory().toUrlishString(); } return {}; }); @@ -1583,7 +1583,7 @@ void ProjectExplorerTest::testProject_multipleBuildConfigs() qDebug() << copyResult.error(); QVERIFY(copyResult); - const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files | QDir::Dirs); + const QFileInfoList files = QDir(projectDir.toUrlishString()).entryInfoList(QDir::Files | QDir::Dirs); for (const QFileInfo &f : files) QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser); const auto theProject = ProjectExplorerPlugin::openProject(projectDir.pathAppended("generic-project.creator")); @@ -1646,7 +1646,7 @@ void ProjectExplorerTest::testSourceToBinaryMapping() if (!result) qDebug() << result.error(); QVERIFY(result); - const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files); + const QFileInfoList files = QDir(projectDir.toUrlishString()).entryInfoList(QDir::Files); for (const QFileInfo &f : files) QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 95076a45862..391a6cde174 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3566,7 +3566,7 @@ void ProjectExplorerPluginPrivate::addNewFile() // store void pointer to avoid QVariant to use qobject_cast, which might core-dump when trying // to access meta data on an object that get deleted in the meantime: map.insert(QLatin1String(Constants::PREFERRED_PROJECT_NODE), QVariant::fromValue(static_cast<void *>(currentNode))); - map.insert(Constants::PREFERRED_PROJECT_NODE_PATH, currentNode->filePath().toString()); + map.insert(Constants::PREFERRED_PROJECT_NODE_PATH, currentNode->filePath().toUrlishString()); Project *p = ProjectTree::projectForNode(currentNode); QTC_ASSERT(p, p = ProjectTree::currentProject()); if (p) { @@ -3598,7 +3598,7 @@ void ProjectExplorerPluginPrivate::addNewHeaderOrSource() QVariantMap map; map.insert(QLatin1String(Constants::PREFERRED_PROJECT_NODE), QVariant::fromValue(static_cast<void *>(folderNode))); - map.insert(Constants::PREFERRED_PROJECT_NODE_PATH, folderNode->filePath().toString()); + map.insert(Constants::PREFERRED_PROJECT_NODE_PATH, folderNode->filePath().toUrlishString()); map.insert("InitialFileName", fileNode->filePath().completeBaseName()); Project *p = ProjectTree::projectForNode(folderNode); QTC_ASSERT(p, p = ProjectTree::currentProject()); @@ -3769,7 +3769,7 @@ void ProjectExplorerPluginPrivate::searchOnFileSystem() { const Node *currentNode = ProjectTree::currentNode(); QTC_ASSERT(currentNode, return); - TextEditor::FindInFiles::findOnFileSystem(currentNode->path().toString()); + TextEditor::FindInFiles::findOnFileSystem(currentNode->path().toUrlishString()); } void ProjectExplorerPluginPrivate::vcsLogDirectory() @@ -3962,7 +3962,7 @@ void ProjectExplorerPluginPrivate::duplicateFile() ProjectTree::CurrentNodeKeeper nodeKeeper; FileNode *fileNode = currentNode->asFileNode(); - QString filePath = currentNode->filePath().toString(); + QString filePath = currentNode->filePath().toUrlishString(); QFileInfo sourceFileInfo(filePath); QString baseName = sourceFileInfo.baseName(); @@ -4185,7 +4185,7 @@ void ProjectExplorerPlugin::renameFilesForSymbol(const QString &oldSymbolName, if (newBaseName == oldBaseName) continue; - const QString newFilePath = file.absolutePath().toString() + '/' + newBaseName + '.' + const QString newFilePath = file.absolutePath().toUrlishString() + '/' + newBaseName + '.' + file.completeSuffix(); filesToRename.emplaceBack(node, FilePath::fromString(newFilePath)); } diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index a4c7df4e61b..6ffa9984b51 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -89,16 +89,16 @@ const QList<BuildInfo> ProjectImporter::import(const Utils::FilePath &importPath Tr::tr("No build found in %1 matching project %2.") .arg(importPath.toUserOutput(), projectFilePath().toUserOutput())); }; - qCDebug(log) << "Examining directory" << absoluteImportPath.toString(); + qCDebug(log) << "Examining directory" << absoluteImportPath.toUrlishString(); QString warningMessage; QList<void *> dataList = examineDirectory(absoluteImportPath, &warningMessage); if (dataList.isEmpty()) { - qCDebug(log) << "Nothing to import found in" << absoluteImportPath.toString(); + qCDebug(log) << "Nothing to import found in" << absoluteImportPath.toUrlishString(); handleFailure(); return result; } if (!warningMessage.isEmpty()) { - qCDebug(log) << "Warning when examining" << absoluteImportPath.toString(); + qCDebug(log) << "Warning when examining" << absoluteImportPath.toUrlishString(); // we should ask user before importing if (silent) return result; @@ -263,7 +263,7 @@ void ProjectImporter::addProject(Kit *k) const UpdateGuard guard(*this); QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList(); - projects.append(m_projectPath.toString()); // note: There can be more than one instance of the project added! + projects.append(m_projectPath.toUrlishString()); // note: There can be more than one instance of the project added! k->setValueSilently(TEMPORARY_OF_PROJECTS, projects); } @@ -275,7 +275,7 @@ void ProjectImporter::removeProject(Kit *k) const UpdateGuard guard(*this); QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList(); - projects.removeOne(m_projectPath.toString()); + projects.removeOne(m_projectPath.toUrlishString()); if (projects.isEmpty()) { cleanupKit(k); diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp index 70f2efb40ec..bc061327f1c 100644 --- a/src/plugins/projectexplorer/projectmanager.cpp +++ b/src/plugins/projectexplorer/projectmanager.cpp @@ -87,7 +87,7 @@ static ProjectManagerPrivate *d = nullptr; static QString projectFolderId(Project *pro) { - return pro->projectFilePath().toString(); + return pro->projectFilePath().toUrlishString(); } const int PROJECT_SORT_VALUE = 100; @@ -349,18 +349,18 @@ void ProjectManagerPrivate::saveSession() SessionManager::setSessionValue("ProjectList", Utils::transform<QStringList>(projectFiles, - &FilePath::toString)); + &FilePath::toUrlishString)); SessionManager::setSessionValue("CascadeSetActive", m_casadeSetActive); SessionManager::setSessionValue("DeployProjectDependencies", m_deployProjectDependencies); QVariantMap depMap; auto i = m_depMap.constBegin(); while (i != m_depMap.constEnd()) { - QString key = i.key().toString(); + QString key = i.key().toUrlishString(); QStringList values; const FilePaths valueList = i.value(); for (const FilePath &value : valueList) - values << value.toString(); + values << value.toUrlishString(); depMap.insert(key, values); ++i; } diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index ace041c9e75..8ebce2c9c2b 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -93,8 +93,8 @@ bool compareNodes(const Node *n1, const Node *n2) if (displayNameResult != 0) return displayNameResult < 0; - const int filePathResult = caseFriendlyCompare(n1->filePath().toString(), - n2->filePath().toString()); + const int filePathResult = caseFriendlyCompare(n1->filePath().toUrlishString(), + n2->filePath().toUrlishString()); return filePathResult < 0; } @@ -254,7 +254,7 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const return node->isEnabled() ? QVariant() : Utils::creatorColor(Utils::Theme::TextColorDisabled); case Project::FilePathRole: - return node->filePath().toString(); + return node->filePath().toUrlishString(); case Project::isParsingRole: return project && bs ? bs->isParsing() && !project->needsConfiguration() : false; case Project::UseUnavailableMarkerRole: @@ -439,7 +439,7 @@ void FlatModel::onExpanded(const QModelIndex &idx) ExpandData FlatModel::expandDataForNode(const Node *node) const { QTC_ASSERT(node, return {}); - return {node->filePath().toString(), node->priority()}; + return {node->filePath().toUrlishString(), node->priority()}; } void FlatModel::handleProjectAdded(Project *project) @@ -828,12 +828,12 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r case DropAction::MoveWithFiles: { FilePaths filesToAdd; FilePaths filesToRemove; - const VcsInfo targetVcs = vcsInfoForFile(targetDir.toString()); + const VcsInfo targetVcs = vcsInfoForFile(targetDir.toUrlishString()); const bool vcsAddPossible = targetVcs.vcs && targetVcs.vcs->supportsOperation(Core::IVersionControl::AddOperation); for (const FilePath &sourceFile : sourceFiles) { const FilePath targetFile = targetFilePath(sourceFile); - const VcsInfo sourceVcs = vcsInfoForFile(sourceFile.toString()); + const VcsInfo sourceVcs = vcsInfoForFile(sourceFile.toUrlishString()); if (sourceVcs.vcs && targetVcs.vcs && sourceVcs == targetVcs && sourceVcs.vcs->supportsOperation(Core::IVersionControl::MoveOperation)) { if (sourceVcs.vcs->vcsMove(sourceFile, targetFile)) { diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index fde30634691..a1fc0d0dc05 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -482,7 +482,7 @@ const QList<Node *> ProjectTree::siblingsWithSameBaseName(const Node *fileNode) return n->asFileNode() && n->filePath().toFileInfo().dir() == fi.dir() && n->filePath().completeBaseName() == fi.completeBaseName() - && n->filePath().toString() != fi.filePath(); + && n->filePath().toUrlishString() != fi.filePath(); }; return productNode->findNodes(filter); } diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 40154bbf385..0925da2c9a4 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -81,7 +81,7 @@ AddNewTree::AddNewTree(FolderNode *node, QList<AddNewTree *> children, const QSt m_canAdd(false) { if (node) - m_toolTip = node->directory().toString(); + m_toolTip = node->directory().toUrlishString(); for (AddNewTree *child : std::as_const(children)) appendChild(child); } @@ -93,7 +93,7 @@ AddNewTree::AddNewTree(FolderNode *node, QList<AddNewTree *> children, m_priority(info.priority) { if (node) - m_toolTip = node->directory().toString(); + m_toolTip = node->directory().toUrlishString(); for (AddNewTree *child : std::as_const(children)) appendChild(child); } @@ -158,7 +158,7 @@ void BestNodeSelector::inspect(AddNewTree *tree, bool isContextNode) { FolderNode *node = tree->node(); if (node->isProjectNodeType()) { - if (static_cast<ProjectNode *>(node)->deploysFolder(m_commonDirectory.toString())) { + if (static_cast<ProjectNode *>(node)->deploysFolder(m_commonDirectory.toUrlishString())) { m_deploys = true; m_deployText += tree->displayName() + QLatin1Char('\n'); } @@ -167,10 +167,10 @@ void BestNodeSelector::inspect(AddNewTree *tree, bool isContextNode) return; const FilePath projectDirectory = node->directory(); - const int projectDirectorySize = projectDirectory.toString().size(); + const int projectDirectorySize = projectDirectory.toUrlishString().size(); if (m_commonDirectory != projectDirectory - && !m_commonDirectory.toString().startsWith( - projectDirectory.toString() + QLatin1Char('/')) // TODO: still required? + && !m_commonDirectory.toUrlishString().startsWith( + projectDirectory.toUrlishString() + QLatin1Char('/')) // TODO: still required? && !isContextNode) return; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 2aed8850d20..20e2851936d 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -221,7 +221,7 @@ RunConfiguration::RunConfiguration(Target *target, Utils::Id id) Tr::tr("The run configuration's working directory."), [this] { const auto wdAspect = aspect<WorkingDirectoryAspect>(); - return wdAspect ? wdAspect->workingDirectory().toString() : QString(); + return wdAspect ? wdAspect->workingDirectory().toUrlishString() : QString(); }); expander.registerVariable("RunConfig:Name", Tr::tr("The run configuration's name."), [this] { return displayName(); }); @@ -245,7 +245,7 @@ RunConfiguration::RunConfiguration(Target *target, Utils::Id id) return CommandLine{executable, arguments, CommandLine::Raw}; CommandLine launcherCommand(launcher.command, launcher.arguments); - launcherCommand.addArg(executable.toString()); + launcherCommand.addArg(executable.toUrlishString()); launcherCommand.addArgs(arguments, CommandLine::Raw); return launcherCommand; diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 138e740c724..c09ce563241 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -234,9 +234,9 @@ void WorkingDirectoryAspect::fromMap(const Store &map) void WorkingDirectoryAspect::toMap(Store &data) const { const QString wd = m_workingDirectory == m_defaultWorkingDirectory - ? QString() : m_workingDirectory.toString(); + ? QString() : m_workingDirectory.toUrlishString(); saveToMap(data, wd, QString(), settingsKey()); - saveToMap(data, m_defaultWorkingDirectory.toString(), QString(), settingsKey() + ".default"); + saveToMap(data, m_defaultWorkingDirectory.toUrlishString(), QString(), settingsKey() + ".default"); } /*! @@ -815,7 +815,7 @@ Launcher::Launcher(const LauncherInfo &testLauncherInfo, const LauncherInfo &emu FilePath command1 = emulatorLauncherInfo.command; if (command1.isRelativePath()) command1 = sourceDirectory.resolvePath(command1); - arguments.append(command1.toString()); + arguments.append(command1.toUrlishString()); arguments.append(emulatorLauncherInfo.arguments); displayName = QString("%1 + %2 (%3)").arg(launcherType2UiString(testLauncherInfo.type), launcherType2UiString(emulatorLauncherInfo.type), diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp index 7eef9c3ff41..546c3a0fcb1 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.cpp +++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp @@ -103,7 +103,7 @@ void SelectableFilesFromDirModel::buildTree(const Utils::FilePath &baseDir, Tree if (symlinkDepth == 0) return; - const QFileInfoList fileInfoList = QDir(baseDir.toString()).entryInfoList(QDir::Files | + const QFileInfoList fileInfoList = QDir(baseDir.toUrlishString()).entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); bool allChecked = true; diff --git a/src/plugins/projectexplorer/simpleprojectwizard.cpp b/src/plugins/projectexplorer/simpleprojectwizard.cpp index 68ea0f998fa..71c5b632dc4 100644 --- a/src/plugins/projectexplorer/simpleprojectwizard.cpp +++ b/src/plugins/projectexplorer/simpleprojectwizard.cpp @@ -177,11 +177,11 @@ GeneratedFiles generateQmakeFiles(const SimpleProjectWizardDialog *wizard, QString *errorMessage) { Q_UNUSED(errorMessage) - const QString projectPath = wizard->projectDir().toString(); + const QString projectPath = wizard->projectDir().toUrlishString(); const QDir dir(projectPath); const QString projectName = wizard->projectName(); const FilePath proFileName = Utils::FilePath::fromString(QFileInfo(dir, projectName + ".pro").absoluteFilePath()); - const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toString); + const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toUrlishString); MimeType headerType = Utils::mimeTypeForName(Utils::Constants::C_HEADER_MIMETYPE); @@ -202,7 +202,7 @@ GeneratedFiles generateQmakeFiles(const SimpleProjectWizardDialog *wizard, QString proHeaders = "HEADERS = \\\n"; for (const FilePath &fileName : wizard->selectedFiles()) { - QString source = dir.relativeFilePath(fileName.toString()); + QString source = dir.relativeFilePath(fileName.toUrlishString()); MimeType mimeType = Utils::mimeTypeForFile(fileName); if (mimeType.matchesName(Utils::Constants::C_HEADER_MIMETYPE) || mimeType.matchesName(Utils::Constants::CPP_HEADER_MIMETYPE)) @@ -236,10 +236,10 @@ GeneratedFiles generateCmakeFiles(const SimpleProjectWizardDialog *wizard, QString *errorMessage) { Q_UNUSED(errorMessage) - const QDir dir(wizard->projectDir().toString()); + const QDir dir(wizard->projectDir().toUrlishString()); const QString projectName = wizard->projectName(); const FilePath projectFileName = Utils::FilePath::fromString(QFileInfo(dir, "CMakeLists.txt").absoluteFilePath()); - const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toString); + const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toUrlishString); MimeType headerType = Utils::mimeTypeForName(Utils::Constants::C_HEADER_MIMETYPE); @@ -265,7 +265,7 @@ GeneratedFiles generateCmakeFiles(const SimpleProjectWizardDialog *wizard, QString srcs = "set (SRCS\n"; for (const FilePath &fileName : wizard->selectedFiles()) - srcs += " " + dir.relativeFilePath(fileName.toString()) + "\n"; + srcs += " " + dir.relativeFilePath(fileName.toUrlishString()) + "\n"; srcs += ")\n"; QString components = "find_package(Qt5 COMPONENTS"; diff --git a/src/plugins/projectexplorer/sysrootkitaspect.cpp b/src/plugins/projectexplorer/sysrootkitaspect.cpp index 32013226dbb..f46ae817cc7 100644 --- a/src/plugins/projectexplorer/sysrootkitaspect.cpp +++ b/src/plugins/projectexplorer/sysrootkitaspect.cpp @@ -155,14 +155,14 @@ void SysRootKitAspect::setSysRoot(Kit *k, const FilePath &v) for (Toolchain *tc : ToolchainKitAspect::toolChains(k)) { if (!tc->sysRoot().isEmpty()) { // It's the sysroot from toolchain, don't set it. - if (tc->sysRoot() == v.toString()) + if (tc->sysRoot() == v.toUrlishString()) return; // We've changed the default toolchain sysroot, set it. break; } } - k->setValue(SysRootKitAspect::id(), v.toString()); + k->setValue(SysRootKitAspect::id(), v.toUrlishString()); } } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index d3700eb6808..9d83d00fc78 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -229,7 +229,7 @@ void TargetSetupPage::setProjectPath(const FilePath &path) { d->projectPath = path; if (!d->projectPath.isEmpty()) { - QFileInfo fileInfo(QDir::cleanPath(path.toString())); + QFileInfo fileInfo(QDir::cleanPath(path.toUrlishString())); QStringList subDirsList = fileInfo.absolutePath().split('/'); d->headerLabel->setText(Tr::tr("The following kits can be used for project <b>%1</b>:", "%1: Project name").arg(subDirsList.last())); diff --git a/src/plugins/projectexplorer/taskfile.cpp b/src/plugins/projectexplorer/taskfile.cpp index cd25fefde87..bcb06611ac2 100644 --- a/src/plugins/projectexplorer/taskfile.cpp +++ b/src/plugins/projectexplorer/taskfile.cpp @@ -107,7 +107,7 @@ static QString unescape(const QString &input) static bool parseTaskFile(QString *errorString, const FilePath &name) { - QFile tf(name.toString()); + QFile tf(name.toUrlishString()); if (!tf.open(QIODevice::ReadOnly)) { *errorString = Tr::tr("Cannot open task file %1: %2") .arg(name.toUserOutput(), tf.errorString()); @@ -147,7 +147,7 @@ static bool parseTaskFile(QString *errorString, const FilePath &name) file = QDir::fromNativeSeparators(file); QFileInfo fi(file); if (fi.isRelative()) - file = parentDir.pathAppended(file).toString(); + file = parentDir.pathAppended(file).toUrlishString(); } description = unescape(description); diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index 3056190d097..e6d7894184f 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -73,8 +73,8 @@ void TaskMark::updateLineNumber(int lineNumber) void TaskMark::updateFilePath(const FilePath &fileName) { - TaskHub::updateTaskFileName(m_task, fileName.toString()); - TextMark::updateFilePath(FilePath::fromString(fileName.toString())); + TaskHub::updateTaskFileName(m_task, fileName.toUrlishString()); + TextMark::updateFilePath(FilePath::fromString(fileName.toUrlishString())); } void TaskMark::removedFromEditor() diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index 52b9edc8cbd..e282548fbc3 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -314,7 +314,7 @@ int TaskModel::sizeOfFile(const QFont &font) m_fileMeasurementFont = font; for (int i = m_lastMaxSizeIndex; i < count; ++i) { - QString filename = m_tasks.at(i).file.toString(); + QString filename = m_tasks.at(i).file.toUrlishString(); const int pos = filename.lastIndexOf(QLatin1Char('/')); if (pos != -1) filename = filename.mid(pos +1); @@ -432,7 +432,7 @@ bool TaskFilterModel::filterAcceptsTask(const Task &task) const return m_filterStringIsRegexp ? m_filterRegexp.isValid() && s.contains(m_filterRegexp) : s.contains(m_filterText, m_filterCaseSensitivity); }; - if ((accepts(task.file.toString()) || accepts(task.description())) == m_filterIsInverted) + if ((accepts(task.file.toUrlishString()) || accepts(task.description())) == m_filterIsInverted) accept = false; } diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 7a3945f82ad..9233d6d255d 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -440,7 +440,7 @@ void TaskWindow::triggerDefaultHandler(const QModelIndex &index) const FilePath userChoice = Utils::chooseFileFromList(task.fileCandidates); if (!userChoice.isEmpty()) { task.file = userChoice; - updatedTaskFileName(task, task.file.toString()); + updatedTaskFileName(task, task.file.toUrlishString()); } } diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index e958049d86b..1551a3adced 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -202,7 +202,7 @@ Toolchains ToolchainManager::registerToolchains(const Toolchains &toolchains) QTC_ASSERT(isLanguageSupported(tc->language()), qDebug() << qPrintable("language \"" + tc->language().toString() + "\" unknown while registering \"" - + tc->compilerCommand().toString() + "\""); + + tc->compilerCommand().toUrlishString() + "\""); notRegistered << tc; continue); QTC_ASSERT(d->m_accessor, notRegistered << tc; continue); diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index e3854d69008..a4147c10cbe 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -242,7 +242,7 @@ static FilePath externalUserFilePath(const Utils::FilePath &projectFilePath, con // Recreate the relative project file hierarchy under the shared directory. // PersistentSettingsWriter::write() takes care of creating the path. return FilePath::fromString( - *externalUserFileDir + '/' + makeRelative(projectFilePath.toString()) + suffix); + *externalUserFileDir + '/' + makeRelative(projectFilePath.toUrlishString()) + suffix); } return {}; } diff --git a/src/plugins/python/pipsupport.cpp b/src/plugins/python/pipsupport.cpp index d7a2dbd645b..cee7c8eda87 100644 --- a/src/plugins/python/pipsupport.cpp +++ b/src/plugins/python/pipsupport.cpp @@ -68,7 +68,7 @@ void PipInstallTask::run() } QStringList arguments = {"-m", "pip", "install"}; if (!m_requirementsFile.isEmpty()) { - arguments << "-r" << m_requirementsFile.toString(); + arguments << "-r" << m_requirementsFile.toUrlishString(); } else { for (const PipPackage &package : m_packages) { QString pipPackage = package.packageName; diff --git a/src/plugins/python/pythonbuildsystem.cpp b/src/plugins/python/pythonbuildsystem.cpp index f091aea2bc7..84b3edaba2b 100644 --- a/src/plugins/python/pythonbuildsystem.cpp +++ b/src/plugins/python/pythonbuildsystem.cpp @@ -201,7 +201,7 @@ void PythonBuildSystem::triggerParsing() || mt.matchesName(Constants::C_PY_GUI_MIMETYPE)) { BuildTargetInfo bti; bti.displayName = displayName; - bti.buildKey = entry.filePath.toString(); + bti.buildKey = entry.filePath.toUrlishString(); bti.targetFilePath = entry.filePath; bti.projectFilePath = projectFile; bti.isQtcRunnable = entry.filePath.fileName() == "main.py"; @@ -280,7 +280,7 @@ bool PythonBuildSystem::addFiles(Node *, const FilePaths &filePaths, FilePaths * for (const FilePath &filePath : filePaths) { if (!projectDir.isSameDevice(filePath)) return false; - m_files.append(FileEntry{filePath.relativePathFrom(projectDir).toString(), filePath}); + m_files.append(FileEntry{filePath.relativePathFrom(projectDir).toUrlishString(), filePath}); } if (isSorted) @@ -314,7 +314,7 @@ bool PythonBuildSystem::renameFiles(Node *, const FilePairs &filesToRename, File if (entry.filePath == oldFilePath) { found = true; entry.filePath = newFilePath; - entry.rawEntry = newFilePath.relativeChildPath(projectDirectory()).toString(); + entry.rawEntry = newFilePath.relativeChildPath(projectDirectory()).toUrlishString(); break; } } diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp index ea92b20d451..9678dcbdf40 100644 --- a/src/plugins/python/pythonlanguageclient.cpp +++ b/src/plugins/python/pythonlanguageclient.cpp @@ -138,7 +138,7 @@ protected: } if (python.isLocal()) { // todo check where to put this tempdir in remote setups - env.appendOrSet("PYTHONPATH", m_extraPythonPath.path().toString()); + env.appendOrSet("PYTHONPATH", m_extraPythonPath.path().toUrlishString()); } if (env.hasChanges()) setEnvironment(env); diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index bc6eebc7885..6ad05a6399d 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -77,7 +77,7 @@ static Interpreter createInterpreter(const FilePath &python, result.name = pythonProcess.cleanedStdOut().trimmed(); if (result.name.isEmpty()) result.name = defaultName; - QDir pythonDir(python.parentDir().toString()); + QDir pythonDir(python.parentDir().toUrlishString()); if (pythonDir.exists() && pythonDir.exists("activate") && pythonDir.cdUp()) result.name += QString(" (%1)").arg(pythonDir.dirName()); if (!suffix.isEmpty()) @@ -664,7 +664,7 @@ static void pythonsFromPath(QPromise<QList<Interpreter>> &promise) const FilePaths dirs = Environment::systemEnvironment().path(); QSet<FilePath> used; for (const FilePath &path : dirs) { - const QDir dir(path.toString()); + const QDir dir(path.toUrlishString()); for (const QFileInfo &fi : dir.entryInfoList(filters)) { if (promise.isCanceled()) return; @@ -967,7 +967,7 @@ void PythonSettings::createVirtualEnvironment( QList<Interpreter> PythonSettings::detectPythonVenvs(const FilePath &path) { QList<Interpreter> result; - QDir dir = path.toFileInfo().isDir() ? QDir(path.toString()) : path.toFileInfo().dir(); + QDir dir = path.toFileInfo().isDir() ? QDir(path.toUrlishString()) : path.toFileInfo().dir(); if (dir.exists()) { const QString venvPython = HostOsInfo::withExecutableSuffix("python"); const QString activatePath = HostOsInfo::isWindowsHost() ? QString{"Scripts"} diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp index efcfc4940a5..b2648fc7306 100644 --- a/src/plugins/python/pythonutils.cpp +++ b/src/plugins/python/pythonutils.cpp @@ -97,7 +97,7 @@ static QStringList replImportArgs(const FilePath &pythonFile, ReplType type) using MimeTypes = QList<MimeType>; const MimeTypes mimeTypes = pythonFile.isEmpty() || type == ReplType::Unmodified ? MimeTypes() - : mimeTypesForFileName(pythonFile.toString()); + : mimeTypesForFileName(pythonFile.toUrlishString()); const bool isPython = Utils::anyOf(mimeTypes, [](const MimeType &mt) { return mt.inherits(Constants::C_PY_MIMETYPE) || mt.inherits(Constants::C_PY3_MIMETYPE); }); diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 957ae83ec58..d00cf486203 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -362,7 +362,7 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor // Reverse engineer the Xcode developer path from the compiler path static const QRegularExpression compilerRe( QStringLiteral("^(?<developerpath>.*)/Toolchains/(?:.+)\\.xctoolchain/usr/bin$")); - const QRegularExpressionMatch compilerReMatch = compilerRe.match(cxxCompilerPath.absolutePath().toString()); + const QRegularExpressionMatch compilerReMatch = compilerRe.match(cxxCompilerPath.absolutePath().toUrlishString()); if (compilerReMatch.hasMatch()) { const QString developerPath = compilerReMatch.captured(QStringLiteral("developerpath")); data.insert(QLatin1String(XCODE_DEVELOPERPATH), developerPath); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 9aec496e0ef..812edd1d465 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -603,7 +603,7 @@ void QbsBuildStepConfigWidget::changeUseDefaultInstallDir(bool useDefault) if (useDefault) config.remove(Constants::QBS_INSTALL_ROOT_KEY); else - config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toString()); + config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toUrlishString()); m_qbsStep->setQbsConfiguration(config); } @@ -613,7 +613,7 @@ void QbsBuildStepConfigWidget::changeInstallDir() return; const GuardLocker locker(m_ignoreChanges); Store config = m_qbsStep->qbsConfiguration(QbsBuildStep::PreserveVariables); - config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toString()); + config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toUrlishString()); m_qbsStep->setQbsConfiguration(config); } diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index c07993b5549..f674dfaac5b 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -164,7 +164,7 @@ void QbsProfileManager::addProfileFromKit(const Kit *k) data = provider->properties(k, data); } if (const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(k)) - data.insert("moduleProviders.Qt.qmakeFilePaths", qt->qmakeFilePath().toString()); + data.insert("moduleProviders.Qt.qmakeFilePaths", qt->qmakeFilePath().toUrlishString()); if (QbsSettings::qbsVersion(dev) < QVersionNumber({1, 20})) { const QString keyPrefix = "profiles." + name + "."; diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 7d472a2255a..8a84ac53c4a 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -283,8 +283,8 @@ bool QbsBuildSystem::renameFiles(Node *context, const FilePairs &filesToRename, bool success = true; for (const auto &[oldFilePath, newFilePath] : filesToRename) { if (!renameFileInProduct( - oldFilePath.toString(), - newFilePath.toString(), + oldFilePath.toUrlishString(), + newFilePath.toUrlishString(), prdNode->productData(), n->groupData())) { success = false; @@ -302,8 +302,8 @@ bool QbsBuildSystem::renameFiles(Node *context, const FilePairs &filesToRename, bool success = true; for (const auto &[oldFilePath, newFilePath] : filesToRename) { if (!renameFileInProduct( - oldFilePath.toString(), - newFilePath.toString(), + oldFilePath.toUrlishString(), + newFilePath.toUrlishString(), n->productData(), n->mainGroup())) { success = false; @@ -340,7 +340,7 @@ ProjectExplorer::DeploymentKnowledge QbsProject::deploymentKnowledge() const FilePaths QbsBuildSystem::filesGeneratedFrom(const FilePath &sourceFile) const { - return FileUtils::toFilePathList(session()->filesGeneratedFrom(sourceFile.toString())); + return FileUtils::toFilePathList(session()->filesGeneratedFrom(sourceFile.toUrlishString())); } bool QbsBuildSystem::isProjectEditable() const @@ -952,7 +952,7 @@ static RawProjectPart generateProjectPart( bool hasObjcFiles = false; bool hasObjcxxFiles = false; const auto artifactWorker = [&](const QJsonObject &source) { - const QString filePath = refFile.withNewPath(source.value("file-path").toString()).toString(); + const QString filePath = refFile.withNewPath(source.value("file-path").toString()).toUrlishString(); QJsonObject translatedSource = source; translatedSource.insert("file-path", filePath); filePathToSourceArtifact.insert(filePath, translatedSource); @@ -998,7 +998,7 @@ static RawProjectPart generateProjectPart( rpp.setPreCompiledHeaders(Utils::toList(pchFiles)); rpp.setIncludedFiles( Utils::transform(arrayToStringList(props.value("cpp.prefixHeaders")), [&](const QString &f) { - return refFile.withNewPath(f).toString(); + return refFile.withNewPath(f).toUrlishString(); })); rpp.setFiles(filePathToSourceArtifact.keys(), {}, [filePathToSourceArtifact](const QString &filePath) { @@ -1019,7 +1019,7 @@ static RawProjectParts generateProjectParts( RawProjectParts rpps; const auto translatedPath = [&](const QJsonValue &v) { QTC_ASSERT(v.isString(), return QString()); - return refFile.withNewPath(v.toString()).toString(); + return refFile.withNewPath(v.toString()).toUrlishString(); }; forAllProducts(projectData, [&](const QJsonObject &prd) { QString cPch; diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 4e9dc0de72b..1400e76aa4f 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -421,7 +421,7 @@ void QbsProjectManagerPlugin::buildFileContextMenu() QTC_ASSERT(node, return); auto project = qobject_cast<QbsProject *>(ProjectTree::currentProject()); QTC_ASSERT(project, return); - buildSingleFile(project, node->filePath().toString()); + buildSingleFile(project, node->filePath().toUrlishString()); } void QbsProjectManagerPlugin::buildFile() @@ -431,7 +431,7 @@ void QbsProjectManagerPlugin::buildFile() if (!project || !node) return; - buildSingleFile(project, node->filePath().toString()); + buildSingleFile(project, node->filePath().toUrlishString()); } void QbsProjectManagerPlugin::buildProductContextMenu() diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp index 947f39e4cb6..38dcb7f7a9a 100644 --- a/src/plugins/qbsprojectmanager/qbssettings.cpp +++ b/src/plugins/qbsprojectmanager/qbssettings.cpp @@ -169,8 +169,8 @@ void QbsSettings::loadSettings() void QbsSettings::storeSettings() const { QtcSettings * const s = Core::ICore::settings(); - s->setValueWithDefault(QBS_EXE_KEY, m_settings.qbsExecutableFilePath.toString(), - defaultQbsExecutableFilePath().toString()); + s->setValueWithDefault(QBS_EXE_KEY, m_settings.qbsExecutableFilePath.toUrlishString(), + defaultQbsExecutableFilePath().toUrlishString()); s->setValue(QBS_DEFAULT_INSTALL_DIR_KEY, m_settings.defaultInstallDirTemplate); s->setValue(USE_CREATOR_SETTINGS_KEY, m_settings.useCreatorSettings); } diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp index d3c543ab9d7..de770d131ac 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.cpp @@ -182,7 +182,7 @@ PluginOptions::WidgetOptions ClassDefinition::widgetOptions(const QString &class wo.pluginClassName = m_pluginClassEdit->text(); wo.pluginHeaderFile = m_pluginHeaderEdit->text(); wo.pluginSourceFile = m_pluginSourceEdit->text(); - wo.iconFile = m_iconPathChooser->filePath().toString(); + wo.iconFile = m_iconPathChooser->filePath().toUrlishString(); wo.group = m_groupEdit->text(); wo.toolTip = m_tooltipEdit->text(); wo.whatsThis = m_whatsthisEdit->toPlainText(); diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp index 03936a66a38..f2c4e7dec5f 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -44,7 +44,7 @@ Core::GeneratedFiles CustomWidgetWizard::generateFiles(const QWizard *w, Q_ASSERT(w); GenerationParameters p; p.fileName = cw->projectName(); - p.path = cw->filePath().toString(); + p.path = cw->filePath().toUrlishString(); p.templatePath = QtWizard::templateDir(); p.templatePath += QLatin1String("/customwidgetwizard"); return PluginGenerator::generatePlugin(p, *(cw->pluginOptions()), errorMessage); diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index c4652d2e352..0d565df1223 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -623,7 +623,7 @@ AddLibraryWizard::LinkageType NonInternalLibraryDetailsController::suggestedLink AddLibraryWizard::LinkageType type = AddLibraryWizard::NoLinkage; if (libraryPlatformType() != OsTypeWindows) { if (libraryDetailsWidget()->libraryPathChooser->isValid()) { - QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toString()); + QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString()); if (fi.suffix() == QLatin1String("a")) type = AddLibraryWizard::StaticLinkage; else @@ -638,7 +638,7 @@ AddLibraryWizard::MacLibraryType NonInternalLibraryDetailsController::suggestedM AddLibraryWizard::MacLibraryType type = AddLibraryWizard::NoLibraryType; if (libraryPlatformType() == OsTypeMac) { if (libraryDetailsWidget()->libraryPathChooser->isValid()) { - QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toString()); + QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString()); if (fi.suffix() == QLatin1String("framework")) type = AddLibraryWizard::FrameworkType; else @@ -652,7 +652,7 @@ QString NonInternalLibraryDetailsController::suggestedIncludePath() const { QString includePath; if (libraryDetailsWidget()->libraryPathChooser->isValid()) { - QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toString()); + QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString()); includePath = fi.absolutePath(); QFileInfo dfi(includePath); // TODO: Win: remove debug or release folder first if appropriate @@ -729,7 +729,7 @@ void NonInternalLibraryDetailsController::handleLibraryPathChange() bool subfoldersEnabled = true; bool removeSuffixEnabled = true; if (libraryDetailsWidget()->libraryPathChooser->isValid()) { - QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toString()); + QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString()); QFileInfo dfi(fi.absolutePath()); const QString parentFolderName = dfi.fileName().toLower(); if (parentFolderName != QLatin1String("debug") && @@ -765,7 +765,7 @@ bool NonInternalLibraryDetailsController::isComplete() const QString NonInternalLibraryDetailsController::snippet() const { - QString libPath = libraryDetailsWidget()->libraryPathChooser->filePath().toString(); + QString libPath = libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString(); QFileInfo fi(libPath); QString libName; const bool removeSuffix = isWindowsGroupVisible() @@ -811,7 +811,7 @@ QString NonInternalLibraryDetailsController::snippet() const } targetRelativePath = appendSeparator(pdir.relativeFilePath(absoluteLibraryPath)); - const QString includePath = libraryDetailsWidget()->includePathChooser->filePath().toString(); + const QString includePath = libraryDetailsWidget()->includePathChooser->filePath().toUrlishString(); if (!includePath.isEmpty()) includeRelativePath = pdir.relativeFilePath(includePath); } @@ -873,7 +873,7 @@ bool PackageLibraryDetailsController::isLinkPackageGenerated() const if (!project) return false; - const ProjectNode *projectNode = project->findNodeForBuildKey(proFile().toString()); + const ProjectNode *projectNode = project->findNodeForBuildKey(proFile().toUrlishString()); if (!projectNode) return false; @@ -923,7 +923,7 @@ void ExternalLibraryDetailsController::updateWindowsOptionsEnablement() bool removeSuffixEnabled = true; if (libraryPlatformType() == OsTypeWindows && libraryDetailsWidget()->libraryPathChooser->isValid()) { - QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toString()); + QFileInfo fi(libraryDetailsWidget()->libraryPathChooser->filePath().toUrlishString()); QFileInfo dfi(fi.absolutePath()); const QString parentFolderName = dfi.fileName().toLower(); if (parentFolderName != QLatin1String("debug") && @@ -1023,7 +1023,7 @@ void InternalLibraryDetailsController::updateProFile() const GuardLocker locker(m_ignoreChanges); - m_rootProjectPath = project->projectDirectory().toString(); + m_rootProjectPath = project->projectDirectory().toUrlishString(); auto t = project->activeTarget(); auto bs = dynamic_cast<QmakeBuildSystem *>(t ? t->buildSystem() : nullptr); @@ -1038,7 +1038,7 @@ void InternalLibraryDetailsController::updateProFile() const QStringList configVar = proFile->variableValue(Variable::Config); if (!configVar.contains(QLatin1String("plugin"))) { - const QString relProFilePath = rootDir.relativeFilePath(proFile->filePath().toString()); + const QString relProFilePath = rootDir.relativeFilePath(proFile->filePath().toUrlishString()); TargetInformation targetInfo = proFile->targetInformation(); const QString itemToolTip = QString::fromLatin1("%1 (%2)").arg(targetInfo.target).arg(relProFilePath); m_proFiles.append(proFile); @@ -1099,7 +1099,7 @@ QString InternalLibraryDetailsController::snippet() const // relative path for the project for which we insert the snippet, // it's relative to the root project - const QString proRelavitePath = rootDir.relativeFilePath(proFile().toString()); + const QString proRelavitePath = rootDir.relativeFilePath(proFile().toUrlishString()); // project for which we insert the snippet @@ -1108,7 +1108,7 @@ QString InternalLibraryDetailsController::snippet() const if (const Project *project = ProjectManager::projectForFile(proFile())) { if (ProjectExplorer::Target *t = project->activeTarget()) if (ProjectExplorer::BuildConfiguration *bc = t->activeBuildConfiguration()) - rootBuildDir.setPath(bc->buildDirectory().toString()); + rootBuildDir.setPath(bc->buildDirectory().toUrlishString()); } // the project for which we insert the snippet inside build tree @@ -1123,8 +1123,8 @@ QString InternalLibraryDetailsController::snippet() const // project node which we want to link against TargetInformation targetInfo = m_proFiles.at(currentIndex)->targetInformation(); - const QString targetRelativePath = appendSeparator(projectBuildDir.relativeFilePath(targetInfo.buildDir.toString())); - const QString includeRelativePath = projectSrcDir.relativeFilePath(libraryDetailsWidget()->includePathChooser->filePath().toString()); + const QString targetRelativePath = appendSeparator(projectBuildDir.relativeFilePath(targetInfo.buildDir.toUrlishString())); + const QString includeRelativePath = projectSrcDir.relativeFilePath(libraryDetailsWidget()->includePathChooser->filePath().toUrlishString()); const bool useSubfolders = libraryDetailsWidget()->useSubfoldersCheckBox->isChecked(); const bool addSuffix = libraryDetailsWidget()->addSuffixCheckBox->isChecked(); diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index bfa504ed60a..298cce0a3aa 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -22,7 +22,7 @@ namespace QmakeProjectManager::Internal { static QString findQMakeLine(const FilePath &makefile, const QString &key) { - QFile fi(makefile.toString()); + QFile fi(makefile.toUrlishString()); if (fi.exists() && fi.open(QFile::ReadOnly)) { static const QString cmakeLine("# CMAKE generated file: DO NOT EDIT!"); QTextStream ts(&fi); @@ -217,7 +217,7 @@ QList<QMakeAssignment> MakeFileParse::parseAssignments(const QList<QMakeAssignme static FilePath findQMakeBinaryFromMakefile(const FilePath &makefile) { - QFile fi(makefile.toString()); + QFile fi(makefile.toUrlishString()); if (fi.exists() && fi.open(QFile::ReadOnly)) { QTextStream ts(&fi); static const QRegularExpression r1(QLatin1String("^QMAKE\\s*=(.*)$")); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index ab6454e05c0..7d8daf4c19b 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -693,7 +693,7 @@ QString QmakeBuildConfiguration::extractSpecFromArguments(QString *args, if (parsedSpec.isChildOf(sourceMkSpecPath)) parsedSpec = parsedSpec.relativeChildPath(sourceMkSpecPath); } - return parsedSpec.toString(); + return parsedSpec.toUrlishString(); } /*! @@ -749,9 +749,9 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath, if (version && version->isInQtSourceDirectory(projectPath)) { // assemble build directory QString projectDirectory = projectPath.toFileInfo().absolutePath(); - QDir qtSourceDir = QDir(version->sourcePath().toString()); + QDir qtSourceDir = QDir(version->sourcePath().toUrlishString()); QString relativeProjectPath = qtSourceDir.relativeFilePath(projectDirectory); - QString qtBuildDir = version->prefix().toString(); + QString qtBuildDir = version->prefix().toUrlishString(); QString absoluteBuildPath = QDir::cleanPath(qtBuildDir + QLatin1Char('/') + relativeProjectPath); info.buildDirectory = FilePath::fromString(absoluteBuildPath); @@ -827,7 +827,7 @@ QmakeBuildConfiguration::LastKitState::LastKitState() = default; QmakeBuildConfiguration::LastKitState::LastKitState(Kit *k) : m_qtVersion(QtKitAspect::qtVersionId(k)), - m_sysroot(SysRootKitAspect::sysRoot(k).toString()), + m_sysroot(SysRootKitAspect::sysRoot(k).toUrlishString()), m_mkspec(QmakeKitAspect::mkspec(k)) { Toolchain *tc = ToolchainKitAspect::cxxToolchain(k); diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 1f5a292467a..70b21ebccc8 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -128,7 +128,7 @@ bool QmakeMakeStep::init() if (bc->fileNodeBuild() && subProFile) { QString objectsDir = subProFile->objectsDirectory(); if (objectsDir.isEmpty()) { - objectsDir = bc->qmakeBuildSystem()->buildDir(subProFile->filePath()).toString(); + objectsDir = bc->qmakeBuildSystem()->buildDir(subProFile->filePath()).toUrlishString(); if (subProFile->isDebugAndRelease()) { if (bc->buildType() == QmakeBuildConfiguration::Debug) objectsDir += "/debug"; @@ -142,11 +142,11 @@ bool QmakeMakeStep::init() const FilePath proFileDir = subProFile->proFile()->sourceDir().canonicalPath(); if (!objectsDir.endsWith('/')) objectsDir += QLatin1Char('/'); - objectsDir += sourceFileDir.relativeChildPath(proFileDir).toString(); + objectsDir += sourceFileDir.relativeChildPath(proFileDir).toUrlishString(); objectsDir = QDir::cleanPath(objectsDir); } - QString relObjectsDir = QDir(pp->workingDirectory().toString()) + QString relObjectsDir = QDir(pp->workingDirectory().toUrlishString()) .relativeFilePath(objectsDir); if (relObjectsDir == ".") relObjectsDir.clear(); diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 3e696699b4c..8003a171df7 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -116,12 +116,12 @@ bool QmakeBuildSystem::supportsAction(Node *context, ProjectAction action, const if (folder) { FilePaths list; folder->forEachFolderNode([&](FolderNode *f) { list << f->filePath(); }); - if (n->deploysFolder(FileUtils::commonPath(list).toString())) + if (n->deploysFolder(FileUtils::commonPath(list).toUrlishString())) addExistingFiles = false; } } - addExistingFiles = addExistingFiles && !n->deploysFolder(node->filePath().toString()); + addExistingFiles = addExistingFiles && !n->deploysFolder(node->filePath().toUrlishString()); if (action == AddExistingFile || action == AddExistingDirectory) return addExistingFiles; @@ -214,7 +214,7 @@ RemovedFilesFromProject QmakeBuildSystem::removeFiles(Node *context, const FileP FilePaths wildcardFiles; FilePaths nonWildcardFiles; for (const FilePath &file : filePaths) { - if (pri->proFile()->isFileFromWildcard(file.toString())) + if (pri->proFile()->isFileFromWildcard(file.toUrlishString())) wildcardFiles << file; else nonWildcardFiles << file; @@ -318,7 +318,7 @@ bool QmakeProFileNode::showInSimpleTree() const QString QmakeProFileNode::buildKey() const { - return filePath().toString(); + return filePath().toUrlishString(); } bool QmakeProFileNode::parseInProgress() const @@ -365,11 +365,11 @@ QVariant QmakeProFileNode::data(Id role) const return singleVariableValue(Variable::AndroidDeploySettingsFile); if (role == Android::Constants::AndroidSoLibPath) { TargetInformation info = targetInformation(); - QStringList res = {info.buildDir.toString()}; + QStringList res = {info.buildDir.toUrlishString()}; FilePath destDir = info.destDir; if (!destDir.isEmpty()) { destDir = info.buildDir.resolvePath(destDir.path()); - res.append(destDir.toString()); + res.append(destDir.toUrlishString()); } res.removeDuplicates(); return res; @@ -389,7 +389,7 @@ QVariant QmakeProFileNode::data(Id role) const if (role == Ios::Constants::IosBuildDir) { const TargetInformation info = targetInformation(); if (info.valid) - return info.buildDir.toString(); + return info.buildDir.toUrlishString(); } if (role == Ios::Constants::IosCmakeGenerator) { diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 67275b7ed72..1406d0d58c9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -313,7 +313,7 @@ void QmakePriFile::processValues(QmakePriFileEvalResult &result) QFileInfo fi((*it).toFileInfo()); if (fi.exists()) { if (fi.isDir()) { - result.recursiveEnumerateFiles += recursiveEnumerate((*it).toString()); + result.recursiveEnumerateFiles += recursiveEnumerate((*it).toUrlishString()); // keep directories ++it; } else { @@ -360,7 +360,7 @@ void QmakePriFile::update(const Internal::QmakePriFileEvalResult &result) void QmakePriFile::watchFolders(const QSet<FilePath> &folders) { - const QSet<QString> folderStrings = Utils::transform(folders, &FilePath::toString); + const QSet<QString> folderStrings = Utils::transform(folders, &FilePath::toUrlishString); QSet<QString> toUnwatch = m_watchedFolders; toUnwatch.subtract(folderStrings); @@ -598,7 +598,7 @@ bool QmakePriFile::canRenameFile(const FilePath &oldFilePath, const FilePath &ne if (newFilePath.isEmpty()) return false; - bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toString()); + bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toUrlishString()); if (changeProFileOptional) return true; @@ -610,7 +610,7 @@ bool QmakePriFile::renameFile(const FilePath &oldFilePath, const FilePath &newFi if (newFilePath.isEmpty()) return false; - bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toString()); + bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toUrlishString()); if (renameFile(oldFilePath, newFilePath, Change::Save)) return true; return changeProFileOptional; @@ -682,13 +682,13 @@ bool QmakePriFile::saveModifiedEditors() FilePaths QmakePriFile::formResources(const FilePath &formFile) const { QStringList resourceFiles; - QFile file(formFile.toString()); + QFile file(formFile.toUrlishString()); if (!file.open(QIODevice::ReadOnly)) return {}; QXmlStreamReader reader(&file); - QFileInfo fi(formFile.toString()); + QFileInfo fi(formFile.toUrlishString()); QDir formDir = fi.absoluteDir(); while (!reader.atEnd()) { reader.readNext(); @@ -761,7 +761,7 @@ QPair<ProFile *, QStringList> QmakePriFile::readProFile() includeFile = parser.parsedProBlock(deviceRoot(), QStringView(contents), 0, - filePath().toString(), + filePath().toUrlishString(), 1); } return {includeFile, lines}; @@ -769,7 +769,7 @@ QPair<ProFile *, QStringList> QmakePriFile::readProFile() bool QmakePriFile::prepareForChange() { - return saveModifiedEditors() && ensureWriteableProFile(filePath().toString()); + return saveModifiedEditors() && ensureWriteableProFile(filePath().toUrlishString()); } bool QmakePriFile::renameFile(const FilePath &oldFilePath, const FilePath &newFilePath, Change mode) @@ -816,7 +816,7 @@ bool QmakePriFile::renameFile(const FilePath &oldFilePath, const FilePath &newFi ProWriter::addFiles(proFile, ¤tLines, - {newFilePath.toString()}, + {newFilePath.toUrlishString()}, loc.first, continuationIndent()); lines = lines.mid(0, loc.second) + currentLines + lines.mid(endLine); @@ -855,17 +855,17 @@ void QmakePriFile::changeFiles(const QString &mimeType, if (change == AddToProFile) { // Use the first variable for adding. ProWriter::addFiles(includeFile, &lines, - Utils::transform(filePaths, &FilePath::toString), + Utils::transform(filePaths, &FilePath::toUrlishString), varNameForAdding(mimeType), continuationIndent()); notChanged->clear(); } else { // RemoveFromProFile - QDir priFileDir = QDir(m_qmakeProFile->directoryPath().toString()); + QDir priFileDir = QDir(m_qmakeProFile->directoryPath().toUrlishString()); *notChanged = FileUtils::toFilePathList( ProWriter::removeFiles(includeFile, &lines, priFileDir, - Utils::transform(filePaths, &FilePath::toString), + Utils::transform(filePaths, &FilePath::toUrlishString), varNamesForRemoving())); } @@ -1860,8 +1860,8 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F if (tryUnfixified) { const QStringList rawValues = reader->values("INCLUDEPATH"); for (const QString &p : rawValues) { - const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toString(), - projectDir, buildDir.toString()); + const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toUrlishString(), + projectDir, buildDir.toUrlishString()); if (IoUtils::isAbsolutePath({}, sysrootifiedPath) && IoUtils::exists({}, sysrootifiedPath)) paths << sysrootifiedPath; } diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index e3cb45c7673..b7d3dfec6b4 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -324,7 +324,7 @@ void QmakeBuildSystem::updateCppCodeModel() RawProjectPart rpp; rpp.setDisplayName(pro->displayName()); rpp.setProjectFileLocation(pro->filePath()); - rpp.setBuildSystemTarget(pro->filePath().toString()); + rpp.setBuildSystemTarget(pro->filePath().toUrlishString()); switch (pro->projectType()) { case ProjectType::ApplicationTemplate: rpp.setBuildTargetType(BuildTargetType::Executable); @@ -392,11 +392,11 @@ void QmakeBuildSystem::updateCppCodeModel() const QList<ProjectExplorer::ExtraCompiler *> proGenerators = pro->extraCompilers(); for (ProjectExplorer::ExtraCompiler *ec : proGenerators) { ec->forEachTarget([&](const FilePath &generatedFile) { - fileList += generatedFile.toString(); + fileList += generatedFile.toUrlishString(); }); } generators.append(proGenerators); - fileList.prepend(CppEditor::CppModelManager::configurationFileName().toString()); + fileList.prepend(CppEditor::CppModelManager::configurationFileName().toUrlishString()); rpp.setFiles(fileList, [cumulativeSourceFiles](const QString &filePath) { // Keep this lambda thread-safe! return !cumulativeSourceFiles.contains(filePath); @@ -815,15 +815,15 @@ FilePath QmakeBuildSystem::buildDir(const FilePath &proFilePath) const // but don't use it. if (proFilePath.isLocal()) { // This branch should not exist. - const QDir srcDirRoot = QDir(projectDirectory().toString()); - const QString relativeDir = srcDirRoot.relativeFilePath(proFilePath.parentDir().toString()); + const QDir srcDirRoot = QDir(projectDirectory().toUrlishString()); + const QString relativeDir = srcDirRoot.relativeFilePath(proFilePath.parentDir().toUrlishString()); // FIXME: Convoluted. Try to migrate to newRes once we feel confident enough. const FilePath oldResult = buildDir.withNewPath( QDir::cleanPath(QDir(buildDir.path()).absoluteFilePath(relativeDir))); const FilePath newResult = buildDir.resolvePath(relativeDir); QTC_ASSERT(oldResult == newResult, qDebug() << "New build dir construction failed. Not equal:" - << oldResult.toString() << newResult.toString()); + << oldResult.toUrlishString() << newResult.toUrlishString()); return oldResult; } @@ -1210,7 +1210,7 @@ void QmakeBuildSystem::updateBuildSystemData() bti.displayNameUniquifier = QString::fromLatin1(" (%1)") .arg(relativePathInProject.toUserOutput()); } - bti.buildKey = bti.projectFilePath.toString(); + bti.buildKey = bti.projectFilePath.toUrlishString(); bti.isQtcRunnable = config.contains("qtc_runnable"); if (config.contains("console") && !config.contains("testcase")) { @@ -1227,7 +1227,7 @@ void QmakeBuildSystem::updateBuildSystemData() if (!libDirectories.isEmpty()) { QmakeProFile *proFile = node->proFile(); QTC_ASSERT(proFile, return); - const QString proDirectory = buildDir(proFile->filePath()).toString(); + const QString proDirectory = buildDir(proFile->filePath()).toUrlishString(); for (QString dir : libDirectories) { // Fix up relative entries like "LIBS+=-L.." const QFileInfo fi(dir); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index 2e85cb71911..f1d2d665716 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -87,7 +87,7 @@ QList<void *> QmakeProjectImporter::examineDirectory(const FilePath &importPath, QList<void *> result; const QLoggingCategory &logs = MakeFileParse::logging(); - const QStringList makefiles = QDir(importPath.toString()).entryList(QStringList(("Makefile*"))); + const QStringList makefiles = QDir(importPath.toUrlishString()).entryList(QStringList(("Makefile*"))); qCDebug(logs) << " Makefiles:" << makefiles; for (const QString &file : makefiles) { diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 56736c61802..40faa9a6195 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -155,7 +155,7 @@ QMakeStepConfig QMakeStep::deducedArguments() const targetAbi = tc->targetAbi(); if (HostOsInfo::isWindowsHost() && tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) { - config.sysRoot = SysRootKitAspect::sysRoot(kit).toString(); + config.sysRoot = SysRootKitAspect::sysRoot(kit).toUrlishString(); config.targetTriple = tc->originalTargetTriple(); } } @@ -365,7 +365,7 @@ QString QMakeStep::effectiveQMakeCall() const if (make.isEmpty()) make = FilePath::fromPathPart(Tr::tr("<no Make step found>")); - QString result = qmake.toString(); + QString result = qmake.toUrlishString(); if (qtVersion) { QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration(); const FilePath makefile = qmakeBc ? qmakeBc->makefile() : FilePath(); @@ -398,7 +398,7 @@ QString QMakeStep::mkspec() const const QStringList args = cmd.splitArguments(); const int pos = args.indexOf("-spec") + 1; if (pos > 0 && pos < args.size()) - return FilePath::fromUserInput(args[pos]).toString(); + return FilePath::fromUserInput(args[pos]).toUrlishString(); return QmakeKitAspect::effectiveMkspec(target()->kit()); } diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index 840a3f849a6..38dcb16c3d9 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp @@ -82,7 +82,7 @@ bool QtWizard::qt4ProjectPostGenerateFiles(const QWizard *w, QString QtWizard::templateDir() { - return Core::ICore::resourcePath("templates/qt4project").toString(); + return Core::ICore::resourcePath("templates/qt4project").toUrlishString(); } bool QtWizard::lowerCaseFiles() diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index 55f4f164c7d..a425c39301c 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -288,7 +288,7 @@ void AssetExporter::preprocessQmlFile(const Utils::FilePath &path) rewriterView->restoreAuxiliaryData(); ModelNode rootNode = rewriterView->rootModelNode(); if (!rootNode.isValid()) { - ExportNotification::addError(tr("Cannot preprocess file: %1").arg(path.toString())); + ExportNotification::addError(tr("Cannot preprocess file: %1").arg(path.toUrlishString())); return; } @@ -317,7 +317,7 @@ void AssetExporter::preprocessQmlFile(const Utils::FilePath &path) // Cache component UUID const QString uuid = rootNode.auxiliaryDataWithDefault(uuidProperty).toString(); - m_componentUuidCache[path.toString()] = uuid; + m_componentUuidCache[path.toUrlishString()] = uuid; } bool AssetExporter::assignUuids(const ModelNode &root) @@ -394,7 +394,7 @@ void AssetExporter::writeMetadata() const auto writeFile = [](const Utils::FilePath &path, const QJsonArray &artboards) { if (!makeParentPath(path)) { ExportNotification::addError(tr("Writing metadata failed. Cannot create file %1"). - arg(path.toString())); + arg(path.toUrlishString())); return; } @@ -542,7 +542,7 @@ void AssetDumper::savePixmap(const QPixmap &p, Utils::FilePath &path) const return; } - if (!p.save(path.toString())) { + if (!p.save(path.toUrlishString())) { ExportNotification::addError(Tr::tr("Error saving asset. %1").arg(path.fileName())); } } diff --git a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp index 5979ea2f657..7530bd9a7ba 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp @@ -122,7 +122,7 @@ void Component::addReferenceAsset(QJsonObject &metadataObject) const QJsonObject assetData; if (metadataObject.contains(AssetDataTag)) assetData = metadataObject[AssetDataTag].toObject(); - assetData.insert(ReferenceAssetTag, refAssetPath.toString()); + assetData.insert(ReferenceAssetTag, refAssetPath.toUrlishString()); metadataObject.insert(AssetDataTag, assetData); } diff --git a/src/plugins/qmldesigner/assetexporterplugin/dumpers/assetnodedumper.cpp b/src/plugins/qmldesigner/assetexporterplugin/dumpers/assetnodedumper.cpp index 3fd6cbb333f..9561044c3ac 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/dumpers/assetnodedumper.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/dumpers/assetnodedumper.cpp @@ -37,7 +37,7 @@ QJsonObject AssetNodeDumper::json(Component &component) const exporter.exportAsset(exporter.generateAsset(m_node), assetPath); QJsonObject assetData; - assetData.insert(AssetPathTag, assetPath.toString()); + assetData.insert(AssetPathTag, assetPath.toUrlishString()); QJsonObject metadata = jsonObject.value(MetadataTag).toObject(); metadata.insert(AssetDataTag, assetData); jsonObject.insert(MetadataTag, metadata); diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp index ea40a45bf4c..53164b9f89e 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp @@ -49,7 +49,7 @@ AnnotationCommentTab::AnnotationCommentTab(QWidget *parent) m_editor->setImageActionVisible(false); } - m_editor->setDocumentBaseUrl(QUrl::fromLocalFile(projectPath.toString())); + m_editor->setDocumentBaseUrl(QUrl::fromLocalFile(projectPath.toUrlishString())); } ui->formLayout->setWidget(3, QFormLayout::FieldRole, m_editor); @@ -157,13 +157,13 @@ QString AnnotationCommentTab::backupFile(const QString &filePath) if (!newFile.exists()) { oldFile.copyFile(newFile); break; - } else if (compareFileChecksum(oldFile.absoluteFilePath().toString(), newFile.absoluteFilePath().toString()) == 0) + } else if (compareFileChecksum(oldFile.absoluteFilePath().toUrlishString(), newFile.absoluteFilePath().toUrlishString()) == 0) break; newFile = imgDir / newNameTemplate.arg(i); } - return newFile.relativeChildPath(projectFolderPath).toString(); + return newFile.relativeChildPath(projectFolderPath).toUrlishString(); } diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp index 96c757a176a..9787d17f3bb 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp @@ -92,12 +92,12 @@ QList<QModelIndex> AssetsLibraryModel::parentIndices(const QModelIndex &index) c QString AssetsLibraryModel::currentProjectDirPath() const { - return DocumentManager::currentProjectDirPath().toString().append('/'); + return DocumentManager::currentProjectDirPath().toUrlishString().append('/'); } QString AssetsLibraryModel::contentDirPath() const { - return DocumentManager::currentResourcePath().toString().append('/'); + return DocumentManager::currentResourcePath().toUrlishString().append('/'); } bool AssetsLibraryModel::requestDeleteFiles(const QStringList &filePaths) diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp index 28bbd0515ac..c5c555839cb 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp @@ -32,7 +32,7 @@ class AssetsLibraryView::ImageCacheData { public: Sqlite::Database database{Utils::PathString{ - Core::ICore::cacheResourcePath("fontimagecache.db").toString()}, + Core::ICore::cacheResourcePath("fontimagecache.db").toUrlishString()}, Sqlite::JournalMode::Wal, Sqlite::LockingMode::Normal}; ImageCacheStorage<Sqlite::Database> storage{database}; diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp index fcb14dc33c8..b62612c4701 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp @@ -59,7 +59,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } bool AssetsLibraryWidget::eventFilter(QObject *obj, QEvent *event) @@ -347,13 +347,13 @@ void AssetsLibraryWidget::handleDeleteEffects([[maybe_unused]] const QStringList // Delete the effect modules for (const QString &effectName : effectNames) { Utils::FilePath eDir = effectsDir.pathAppended(effectName); - if (eDir.exists() && eDir.toString().startsWith(m_assetsModel->currentProjectDirPath())) { + if (eDir.exists() && eDir.toUrlishString().startsWith(m_assetsModel->currentProjectDirPath())) { QString error; eDir.removeRecursively(&error); if (!error.isEmpty()) { QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("Failed to Delete Effect Resources"), - Tr::tr("Could not delete \"%1\".").arg(eDir.toString())); + Tr::tr("Could not delete \"%1\".").arg(eDir.toUrlishString())); } } } @@ -401,7 +401,7 @@ void AssetsLibraryWidget::handleAssetsDrop(const QList<QUrl> &urls, const QStrin Utils::FilePath destDir = Utils::FilePath::fromUserInput(targetDir); - QString resourceFolder = DocumentManager::currentResourcePath().toString(); + QString resourceFolder = DocumentManager::currentResourcePath().toUrlishString(); if (destDir.isFile()) destDir = destDir.parentDir(); @@ -425,7 +425,7 @@ void AssetsLibraryWidget::handleAssetsDrop(const QList<QUrl> &urls, const QStrin int userAction = msgBox.buttonRole(msgBox.clickedButton()); if (userAction == QMessageBox::AcceptRole) { // "Keep Both" - dest = Utils::FilePath::fromString(UniqueName::generatePath(dest.toString())); + dest = Utils::FilePath::fromString(UniqueName::generatePath(dest.toUrlishString())); } else if (userAction == QMessageBox::ResetRole && dest.exists()) { // "Replace" if (!dest.removeFile()) { qWarning() << __FUNCTION__ << "Failed to remove existing file" << dest; @@ -543,7 +543,7 @@ QString AssetsLibraryWidget::qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/assetsLibraryQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/assetsLibraryQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/assetsLibraryQmlSources").toUrlishString(); } void AssetsLibraryWidget::clearSearchFilter() @@ -675,7 +675,7 @@ void AssetsLibraryWidget::addResources(const QStringList &files, bool showDialog } static QString lastDir; - const QString currentDir = lastDir.isEmpty() ? document->fileName().parentDir().toString() : lastDir; + const QString currentDir = lastDir.isEmpty() ? document->fileName().parentDir().toUrlishString() : lastDir; fileNames = QFileDialog::getOpenFileNames(Core::ICore::dialogParent(), Tr::tr("Add Assets"), @@ -710,7 +710,7 @@ void AssetsLibraryWidget::addResources(const QStringList &files, bool showDialog QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_RESOURCE_IMPORTED + category); if (operation) { AddFilesResult result = operation(fileNames, - document->fileName().parentDir().toString(), showDialog); + document->fileName().parentDir().toUrlishString(), showDialog); if (result.status() == AddFilesResult::Failed) { failedOpsFiles.append(fileNames); } else { diff --git a/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp b/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp index 8f68f47e647..26f9b457aa3 100644 --- a/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp +++ b/src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp @@ -50,7 +50,7 @@ QString BundleImporter::importComponent(const QString &bundleDir, return "Failed to resolve bundle import folder"; if (!bundleImportPath.exists() && !bundleImportPath.createDir()) - return QStringLiteral("Failed to create bundle import folder: '%1'").arg(bundleImportPath.toString()); + return QStringLiteral("Failed to create bundle import folder: '%1'").arg(bundleImportPath.toUrlishString()); bool doScan = false; bool doReset = false; @@ -85,7 +85,7 @@ QString BundleImporter::importComponent(const QString &bundleDir, FilePath target = bundleImportPath.pathAppended(file); FilePath parentDir = target.parentDir(); if (!parentDir.exists() && !parentDir.createDir()) - return QStringLiteral("Failed to create folder for: '%1'").arg(target.toString()); + return QStringLiteral("Failed to create folder for: '%1'").arg(target.toUrlishString()); FilePath source = bundleDirPath.pathAppended(file); if (target.exists()) { @@ -94,7 +94,7 @@ QString BundleImporter::importComponent(const QString &bundleDir, target.removeFile(); // Remove existing file for update } if (!source.copyFile(target)) - return QStringLiteral("Failed to copy file: '%1'").arg(source.toString()); + return QStringLiteral("Failed to copy file: '%1'").arg(source.toUrlishString()); } QVariantHash assetRefMap = loadAssetRefMap(bundleImportPath); @@ -317,7 +317,7 @@ void BundleImporter::writeAssetRefMap(const FilePath &bundlePath, const QVariant QJsonObject jsonObj = QJsonObject::fromVariantHash(assetRefMap); if (!assetRefPath.writeFileContents(QJsonDocument{jsonObj}.toJson())) { // Failure to write asset refs is not considred fatal, so just print error - qWarning() << QStringLiteral("Failed to save bundle asset ref file: '%1'").arg(assetRefPath.toString()) ; + qWarning() << QStringLiteral("Failed to save bundle asset ref file: '%1'").arg(assetRefPath.toUrlishString()) ; } } @@ -333,11 +333,11 @@ QString BundleImporter::unimportComponent(const TypeName &type, const QString &q return QStringLiteral("Failed to resolve bundle import folder for: '%1'").arg(qmlFile); if (!bundleImportPath.exists()) - return QStringLiteral("Unable to find bundle path: '%1'").arg(bundleImportPath.toString()); + return QStringLiteral("Unable to find bundle path: '%1'").arg(bundleImportPath.toUrlishString()); FilePath qmlFilePath = bundleImportPath.resolvePath(qmlFile); if (!qmlFilePath.exists()) - return QStringLiteral("Unable to find specified file: '%1'").arg(qmlFilePath.toString()); + return QStringLiteral("Unable to find specified file: '%1'").arg(qmlFilePath.toUrlishString()); QStringList removedFiles; removedFiles.append(qmlFile); @@ -362,7 +362,7 @@ QString BundleImporter::unimportComponent(const TypeName &type, const QString &q } if (newContent != qmldirContent) { if (!qmldirPath.writeFileContents(newContent)) - return QStringLiteral("Failed to write qmldir file: '%1'").arg(qmldirPath.toString()); + return QStringLiteral("Failed to write qmldir file: '%1'").arg(qmldirPath.toUrlishString()); } } diff --git a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp index 51574c1195f..b9920170159 100644 --- a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp @@ -36,7 +36,7 @@ static QString styleConfigFileName(const QString &qmlFileName) &Utils::FilePath::fileName); if (foundFile != std::end(fileNames)) - return foundFile->toString(); + return foundFile->toUrlishString(); } } } @@ -105,7 +105,7 @@ void ChangeStyleWidgetAction::changeCurrentStyle(const QString &style, const QSt styleConfigFileName(qmlFileName)); if (configFileName.exists()) { - QSettings infiFile(configFileName.toString(), QSettings::IniFormat); + QSettings infiFile(configFileName.toUrlishString(), QSettings::IniFormat); int contains = -1; diff --git a/src/plugins/qmldesigner/components/componentcore/createtexture.cpp b/src/plugins/qmldesigner/components/componentcore/createtexture.cpp index 8712de61473..e4b58f6433f 100644 --- a/src/plugins/qmldesigner/components/componentcore/createtexture.cpp +++ b/src/plugins/qmldesigner/components/componentcore/createtexture.cpp @@ -220,7 +220,7 @@ void CreateTexture::execute(const QStringList &filePaths, AddTextureMode mode, i bool CreateTexture::addFileToProject(const QString &filePath) { AddFilesResult result = ModelNodeOperations::addImageToProject( - {filePath}, ModelNodeOperations::getImagesDefaultDirectory().toString(), false); + {filePath}, ModelNodeOperations::getImagesDefaultDirectory().toUrlishString(), false); if (result.status() == AddFilesResult::Failed) { Core::AsynchronousMessageBox::warning(Tr::tr("Failed to Add Texture"), @@ -242,7 +242,7 @@ ModelNode CreateTexture::createTextureFromImage(const Utils::FilePath &assetPat NodeMetaInfo metaInfo = m_view->model()->qtQuick3DTextureMetaInfo(); - QString textureSource = assetPath.relativePathFrom(DocumentManager::currentFilePath()).toString(); + QString textureSource = assetPath.relativePathFrom(DocumentManager::currentFilePath()).toUrlishString(); ModelNode newTexNode = Utils3D::getTextureDefaultInstance(textureSource, m_view); if (!newTexNode.isValid()) { diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 8705c4daccf..cc791431029 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -2238,7 +2238,7 @@ QString DesignerActionManager::designerIconResourcesPath() const if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/designericons.json"; #endif - return Core::ICore::resourcePath("qmldesigner/designericons.json").toString(); + return Core::ICore::resourcePath("qmldesigner/designericons.json").toUrlishString(); } DesignerActionToolBar::DesignerActionToolBar(QWidget *parentWidget) : Utils::StyledBar(parentWidget), diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index d21a9e6a4e3..4c31579f35c 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -674,7 +674,7 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState QString itemId = modelNode.id(); const Utils::FilePath currentDesignDocument = QmlDesignerPlugin::instance()->documentManager().currentDesignDocument()->fileName(); - const QString fileName = currentDesignDocument.toString(); + const QString fileName = currentDesignDocument.toUrlishString(); const QString typeName = currentDesignDocument.baseName(); QStringList signalNames = cleanSignalNames(getSortedSignalNameList(selectionState.selectedModelNodes().constFirst())); @@ -689,7 +689,7 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState return; } - usages = FindImplementation::run(usages.constFirst().path.toString(), typeName, itemId); + usages = FindImplementation::run(usages.constFirst().path.toUrlishString(), typeName, itemId); Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); @@ -725,7 +725,7 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState selectionState.view()->model()); //Move cursor to correct curser position - const QString filePath = Core::EditorManager::currentDocument()->filePath().toString(); + const QString filePath = Core::EditorManager::currentDocument()->filePath().toUrlishString(); QList<QmlJSEditor::FindReferences::Usage> usages = FindImplementation::run(filePath, typeName, itemId); Core::EditorManager::openEditorAt({Utils::FilePath::fromString(filePath), usages.constFirst().line, @@ -1129,7 +1129,7 @@ static QString getAssetDefaultDirectory(const QString &assetDir, const QString & assetPath.createDir(); if (assetPath.exists() && assetPath.isDir()) - adjustedDefaultDirectory = assetPath.toString(); + adjustedDefaultDirectory = assetPath.toUrlishString(); return adjustedDefaultDirectory; } @@ -1465,7 +1465,7 @@ QString getTemplateDialog(const Utils::FilePath &projectPath) { const Utils::FilePath templatesPath = projectPath.pathAppended("templates"); - const QStringList templateFiles = QDir(templatesPath.toString()).entryList({"*.qml"}); + const QStringList templateFiles = QDir(templatesPath.toUrlishString()).entryList({"*.qml"}); QStringList names; @@ -1513,7 +1513,7 @@ QString getTemplateDialog(const Utils::FilePath &projectPath) QObject::connect(browseButton, &QPushButton::clicked, dialog, [setTemplate, &projectPath]() { const QString newFile = QFileDialog::getOpenFileName(Core::ICore::dialogParent(), Tr::tr("TemplateMerge", "Browse Template"), - projectPath.toString(), + projectPath.toUrlishString(), "*.qml"); if (!newFile.isEmpty()) setTemplate(newFile); @@ -1539,7 +1539,7 @@ QString getTemplateDialog(const Utils::FilePath &projectPath) if (!result.isEmpty() && !QFileInfo::exists(result)) { result = templateFiles.at(names.indexOf(result)); - result = templatesPath.pathAppended(result).toString(); + result = templatesPath.pathAppended(result).toUrlishString(); } return result; @@ -1806,7 +1806,7 @@ void openOldEffectMaker(const QString &filePath) arguments << filePath; if (effectPath.fileContents()->isEmpty()) arguments << "--create"; - arguments << "--exportpath" << effectResPath.toString(); + arguments << "--exportpath" << effectResPath.toUrlishString(); if (env.osType() == Utils::OsTypeMac) env.set("QSG_RHI_BACKEND", "metal"); @@ -1837,7 +1837,7 @@ QString getEffectsDefaultDirectory(const QString &defaultDir) if (defaultDir.isEmpty()) { return Utils::FilePath::fromString(getAssetDefaultDirectory( "effects", - QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString())).toString(); + QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString())).toUrlishString(); } return getAssetDefaultDirectory("effects", defaultDir); @@ -1882,7 +1882,7 @@ Utils::FilePath getImagesDefaultDirectory() { return Utils::FilePath::fromString(getAssetDefaultDirectory( "images", - QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString())); + QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString())); } void jumpToCode(const ModelNode &modelNode) @@ -1983,7 +1983,7 @@ bool dropAsImage3dTexture(const ModelNode &targetNode, .absolutePath() .pathAppended(relImagePath) .cleanPath() - .toString()}); + .toUrlishString()}); } }); return true; diff --git a/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp b/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp index d512ce47546..7cdc9ac910d 100644 --- a/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp +++ b/src/plugins/qmldesigner/components/componentcore/resourcegenerator.cpp @@ -57,7 +57,7 @@ void generateMenuEntry(QObject *parent) projectPath.pathAppended(project->displayName() + ".qrc"), Tr::tr("QmlDesigner::GenerateResource", "QML Resource File (*.qrc)")); - if (qrcFilePath.toString().isEmpty()) + if (qrcFilePath.toUrlishString().isEmpty()) return; createQrcFile(qrcFilePath); @@ -65,7 +65,7 @@ void generateMenuEntry(QObject *parent) Core::AsynchronousMessageBox::information( Tr::tr("QmlDesigner::GenerateResource", "Success"), Tr::tr("QmlDesigner::GenerateResource", "Successfully generated QRC resource file\n %1") - .arg(qrcFilePath.toString())); + .arg(qrcFilePath.toUrlishString())); }); // ToDo: move this to QtCreator and add tr to the string then @@ -90,7 +90,7 @@ void generateMenuEntry(QObject *parent) projectPath.pathAppended(project->displayName() + ".qmlrc"), "QML Resource File (*.qmlrc);;Resource File (*.rcc)"); - if (qmlrcFilePath.toString().isEmpty()) + if (qmlrcFilePath.toUrlishString().isEmpty()) return; QProgressDialog progress; @@ -158,7 +158,7 @@ QStringList getProjectFileList() bool createQrcFile(const FilePath &qrcFilePath) { - QFile qrcFile(qrcFilePath.toString()); + QFile qrcFile(qrcFilePath.toUrlishString()); if (!qrcFile.open(QIODeviceBase::WriteOnly | QIODevice::Truncate)) return false; @@ -203,15 +203,15 @@ bool createQmlrcFile(const FilePath &qmlrcFilePath) "--threshold", "30", "--output", - qmlrcFilePath.toString(), - tempQrcFile.toString()}; + qmlrcFilePath.toUrlishString(), + tempQrcFile.toUrlishString()}; rccProcess.setCommand({rccBinary, arguments}); rccProcess.start(); if (!rccProcess.waitForStarted()) { Core::MessageManager::writeDisrupting( Tr::tr("QmlDesigner::GenerateResource", "Unable to generate resource file: %1") - .arg(qmlrcFilePath.toString())); + .arg(qmlrcFilePath.toUrlishString())); return false; } diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp index 6b4e3b3616a..1300c94b545 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.cpp +++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp @@ -32,7 +32,7 @@ Theme::Theme(Utils::Theme *originTheme, QObject *parent) QString constantsPath = Core::ICore::resourcePath( "qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml") - .toString(); + .toUrlishString(); QQmlEngine *engine = new QQmlEngine(this); setupTheme(engine); diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp index a07c58c8565..7dbb3491f50 100644 --- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp @@ -85,7 +85,7 @@ public: QmlModelState savedState; Internal::DebugView debugView; Sqlite::Database auxiliaryDataDatabase{ - Utils::PathString{Core::ICore::userResourcePath("auxiliary_data.db").toString()}, + Utils::PathString{Core::ICore::userResourcePath("auxiliary_data.db").toUrlishString()}, Sqlite::JournalMode::Wal, Sqlite::LockingMode::Normal}; AuxiliaryPropertyStorageView auxiliaryDataKeyView; diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp index 47d70395ba7..a60edca67b9 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp @@ -38,7 +38,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } class ConnectionViewQuickWidget : public StudioQuickWidget @@ -111,7 +111,7 @@ public: if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/connectionseditor"; #endif - return Core::ICore::resourcePath("qmldesigner/connectionseditor").toString(); + return Core::ICore::resourcePath("qmldesigner/connectionseditor").toUrlishString(); } private: diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp index 2b2aa318fd8..76eeba21c85 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp @@ -59,7 +59,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event) @@ -682,7 +682,7 @@ QString ContentLibraryWidget::qmlSourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/contentLibraryQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/contentLibraryQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/contentLibraryQmlSource").toUrlishString(); } void ContentLibraryWidget::clearSearchFilter() diff --git a/src/plugins/qmldesigner/components/designsystemview/designsystemwidget.cpp b/src/plugins/qmldesigner/components/designsystemview/designsystemwidget.cpp index 7d698a8f94d..85d83cf5ae5 100644 --- a/src/plugins/qmldesigner/components/designsystemview/designsystemwidget.cpp +++ b/src/plugins/qmldesigner/components/designsystemview/designsystemwidget.cpp @@ -41,7 +41,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } DesignSystemWidget::DesignSystemWidget(DesignSystemView *view, DesignSystemInterface *interface) @@ -79,7 +79,7 @@ QString DesignSystemWidget::qmlSourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/designsystem"; #endif - return Core::ICore::resourcePath("qmldesigner/designsystem").toString(); + return Core::ICore::resourcePath("qmldesigner/designsystem").toUrlishString(); } void DesignSystemWidget::showEvent(QShowEvent *event) diff --git a/src/plugins/qmldesigner/components/devicesharing/devicemanagerwidget.cpp b/src/plugins/qmldesigner/components/devicesharing/devicemanagerwidget.cpp index cb932d85fc2..53113986994 100644 --- a/src/plugins/qmldesigner/components/devicesharing/devicemanagerwidget.cpp +++ b/src/plugins/qmldesigner/components/devicesharing/devicemanagerwidget.cpp @@ -36,7 +36,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } DeviceManagerWidget::DeviceManagerWidget(DeviceManager &deviceManager, QWidget *parent) @@ -77,7 +77,7 @@ QString DeviceManagerWidget::qmlSourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/devicemanager"; #endif - return Core::ICore::resourcePath("qmldesigner/devicemanager").toString(); + return Core::ICore::resourcePath("qmldesigner/devicemanager").toUrlishString(); } void DeviceManagerWidget::showEvent(QShowEvent *event) diff --git a/src/plugins/qmldesigner/components/edit3d/bakelights.cpp b/src/plugins/qmldesigner/components/edit3d/bakelights.cpp index b4dc18a110d..71436961c96 100644 --- a/src/plugins/qmldesigner/components/edit3d/bakelights.cpp +++ b/src/plugins/qmldesigner/components/edit3d/bakelights.cpp @@ -47,7 +47,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } static QString qmlSourcesPath() @@ -56,7 +56,7 @@ static QString qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/edit3dQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toUrlishString(); } BakeLights::BakeLights(AbstractView *view) diff --git a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp index fd6feaecadd..cc36fbc3b6c 100644 --- a/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp +++ b/src/plugins/qmldesigner/components/edit3d/cameraspeedconfiguration.cpp @@ -23,7 +23,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } static QString qmlSourcesPath() @@ -32,7 +32,7 @@ static QString qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/edit3dQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toUrlishString(); } CameraSpeedConfiguration::CameraSpeedConfiguration(Edit3DView *view) diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp index b90c0778e6b..a0ac71a9399 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp @@ -30,7 +30,7 @@ static QQuickWidget *createBusyIndicator(QWidget *p) { auto widget = new QQuickWidget(p); - const QString source = Core::ICore::resourcePath("qmldesigner/misc/BusyIndicator.qml").toString(); + const QString source = Core::ICore::resourcePath("qmldesigner/misc/BusyIndicator.qml").toUrlishString(); QTC_ASSERT(QFileInfo::exists(source), return widget); widget->setSource(QUrl::fromLocalFile(source)); widget->setFixedSize(64, 64); diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index ee8a7e70e47..794ebe93ada 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -273,7 +273,7 @@ void Edit3DView::modelAttached(Model *model) { AbstractView::modelAttached(model); - QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toString(); + QString currProjectPath = QmlDesigner::DocumentManager::currentProjectDirPath().toUrlishString(); if (m_currProjectPath != currProjectPath) { // Opening a new project -> reset camera speeds m_currProjectPath = currProjectPath; diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index 9808da6e696..c4ea46287b9 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -461,7 +461,7 @@ void Edit3DWidget::updateCreateSubMenu(const QList<ItemLibraryDetails> &entriesL m_createSubMenu->setIcon(contextIcon(DesignerIcons::CreateIcon)); m_contextMenu->addMenu(m_createSubMenu); - const QString docPath = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName().toString(); + const QString docPath = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName().toUrlishString(); auto isEntryValid = [&](const ItemLibraryEntry &entry) -> bool { // Don't allow entries that match current document diff --git a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp index 8890ea89641..5fc5762751c 100644 --- a/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp +++ b/src/plugins/qmldesigner/components/edit3d/snapconfiguration.cpp @@ -27,7 +27,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } static QString qmlSourcesPath() @@ -36,7 +36,7 @@ static QString qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/edit3dQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/edit3dQmlSource").toUrlishString(); } SnapConfiguration::SnapConfiguration(Edit3DView *view) diff --git a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp index 22de112b6db..f7c9b34fed5 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp @@ -31,7 +31,7 @@ Utils::FilePath projectFilePath() static Utils::FilePath findFile(const Utils::FilePath &path, const QString &fileName) { - QDirIterator it(path.toString(), QDirIterator::Subdirectories); + QDirIterator it(path.toUrlishString(), QDirIterator::Subdirectories); while (it.hasNext()) { QFileInfo file(it.next()); diff --git a/src/plugins/qmldesigner/components/import3d/import3ddialog.cpp b/src/plugins/qmldesigner/components/import3d/import3ddialog.cpp index 3c770b799e9..6c9a64663cf 100644 --- a/src/plugins/qmldesigner/components/import3d/import3ddialog.cpp +++ b/src/plugins/qmldesigner/components/import3d/import3ddialog.cpp @@ -152,12 +152,12 @@ Import3dDialog::Import3dDialog( importPaths = model->importPaths(); } - QString targetDir = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString(); + QString targetDir = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString(); if (targetDir.isEmpty()) targetDir = defaulTargetDirectory; m_quick3DImportPath = QmlDesignerPlugin::instance()->documentManager() - .generatedComponentUtils().import3dBasePath().toString(); + .generatedComponentUtils().import3dBasePath().toUrlishString(); if (!m_quick3DFiles.isEmpty()) { QVector<QJsonObject> groups; @@ -342,7 +342,7 @@ void Import3dDialog::updateImport(AbstractView *view, = ProjectExplorer::ProjectManager::projectForFile( Utils::FilePath::fromString(compFileName)); if (currentProject) - initialPath = currentProject->projectDirectory().toString(); + initialPath = currentProject->projectDirectory().toUrlishString(); else initialPath = compFileInfo.absolutePath(); QStringList selectedFiles = QFileDialog::getOpenFileNames( diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index c7508fbe8f9..89787ff7aab 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -321,7 +321,7 @@ bool DesignDocument::hasQmlParseErrors() const QString DesignDocument::displayName() const { - return fileName().toString(); + return fileName().toUrlishString(); } QString DesignDocument::simplfiedDisplayName() const @@ -335,10 +335,10 @@ QString DesignDocument::simplfiedDisplayName() const void DesignDocument::updateFileName(const Utils::FilePath & /*oldFileName*/, const Utils::FilePath &newFileName) { if (m_documentModel) - m_documentModel->setFileUrl(QUrl::fromLocalFile(newFileName.toString())); + m_documentModel->setFileUrl(QUrl::fromLocalFile(newFileName.toUrlishString())); if (m_inFileComponentModel) - m_inFileComponentModel->setFileUrl(QUrl::fromLocalFile(newFileName.toString())); + m_inFileComponentModel->setFileUrl(QUrl::fromLocalFile(newFileName.toUrlishString())); emit displayNameChanged(displayName()); } @@ -543,7 +543,7 @@ void DesignDocument::close() void DesignDocument::updateSubcomponentManager() { Q_ASSERT(m_subComponentManager); - m_subComponentManager->update(QUrl::fromLocalFile(fileName().toString()), + m_subComponentManager->update(QUrl::fromLocalFile(fileName().toUrlishString()), currentModel()->imports() + currentModel()->possibleImports()); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index ca8a05e81cc..0f262d6663d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -71,7 +71,7 @@ static QString propertyEditorResourcesPath() if (::Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } bool ItemLibraryWidget::eventFilter(QObject *obj, QEvent *event) @@ -307,7 +307,7 @@ QString ItemLibraryWidget::qmlSourcesPath() if (::Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/itemLibraryQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/itemLibraryQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/itemLibraryQmlSources").toUrlishString(); } void ItemLibraryWidget::clearSearchFilter() diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index 694db4af421..a9fa2b529b2 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -42,7 +42,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } MaterialBrowserView::MaterialBrowserView(AsynchronousImageCache &imageCache, diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp index 40e7652e66a..9ac95dba432 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp @@ -45,7 +45,7 @@ static QString propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } class PreviewImageProvider : public QQuickImageProvider @@ -394,7 +394,7 @@ QString MaterialBrowserWidget::qmlSourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/materialBrowserQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/materialBrowserQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/materialBrowserQmlSource").toUrlishString(); } void MaterialBrowserWidget::clearSearchFilter() diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp index 0df1c059156..89fd07b96a8 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp @@ -276,7 +276,7 @@ QString MaterialEditorQmlBackend::materialEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/materialEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/materialEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/materialEditorQmlSources").toUrlishString(); } void MaterialEditorQmlBackend::emitSelectionToBeChanged() diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp index bb019ffd6ee..1b87ba0e753 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp @@ -22,9 +22,9 @@ const char settingsFileName[] = "GradientPresets.ini"; QString settingsFullFilePath(const QSettings::Scope &scope) { if (scope == QSettings::SystemScope) - return Core::ICore::installerResourcePath(settingsFileName).toString(); + return Core::ICore::installerResourcePath(settingsFileName).toUrlishString(); - return Core::ICore::userResourcePath(settingsFileName).toString(); + return Core::ICore::userResourcePath(settingsFileName).toUrlishString(); } } // namespace Internal diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index dbdc18ff906..047e78045b9 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -636,7 +636,7 @@ QString PropertyEditorQmlBackend::propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } inline bool dotPropertyHeuristic(const QmlObjectNode &node, diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index e82f9aaa809..87737db188a 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -42,7 +42,7 @@ static QString propertyEditorResourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } int StatesEditorWidget::currentStateInternalId() const @@ -105,7 +105,7 @@ QString StatesEditorWidget::qmlSourcesPath() if (qEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/stateseditor"; #endif - return Core::ICore::resourcePath("qmldesigner/stateseditor").toString(); + return Core::ICore::resourcePath("qmldesigner/stateseditor").toUrlishString(); } void StatesEditorWidget::showEvent(QShowEvent *event) diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 4bf1682a6dc..35c702af534 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -250,7 +250,7 @@ void TextEditorView::reformatFile() qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(Core::EditorManager::currentDocument()); // Reformat document if we have a .ui.qml file - if (document && document->filePath().toString().endsWith(".ui.qml") + if (document && document->filePath().toUrlishString().endsWith(".ui.qml") && QmlDesignerPlugin::settings().value(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()) { QmlJS::Document::Ptr currentDocument(document->semanticInfo().document); diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp index a684872f1d4..c58067e653a 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp @@ -345,7 +345,7 @@ QString TextureEditorContextObject::resolveResourcePath(const QString &path) if (Utils::FilePath::fromString(path).isAbsolutePath()) return path; return QmlDesignerPlugin::instance()->documentManager().currentDesignDocument() - ->fileName().absolutePath().pathAppended(path).cleanPath().toString(); + ->fileName().absolutePath().pathAppended(path).cleanPath().toUrlishString(); } } // QmlDesigner diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp index 4e46a82f2b0..530dd6b9d69 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp @@ -264,7 +264,7 @@ QString TextureEditorQmlBackend::propertyEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } void TextureEditorQmlBackend::emitSelectionToBeChanged() diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp index ce0d5000252..da745f26e03 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp @@ -386,7 +386,7 @@ QString TextureEditorView::textureEditorResourcesPath() if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/textureEditorQmlSource"; #endif - return Core::ICore::resourcePath("qmldesigner/textureEditorQmlSource").toString(); + return Core::ICore::resourcePath("qmldesigner/textureEditorQmlSource").toUrlishString(); } void TextureEditorView::applyTextureToSelectedModel(const ModelNode &texture) diff --git a/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp b/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp index b06023242f1..9f50ecf8457 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp @@ -137,9 +137,9 @@ const char settingsFileName[] = "EasingCurves.ini"; QString settingsFullFilePath(const QSettings::Scope &scope) { if (scope == QSettings::SystemScope) - return Core::ICore::resourcePath("qmldesigner/%1").toString().arg(settingsFileName); + return Core::ICore::resourcePath("qmldesigner/%1").toUrlishString().arg(settingsFileName); - return Core::ICore::userResourcePath(settingsFileName).toString(); + return Core::ICore::userResourcePath(settingsFileName).toUrlishString(); } } // namespace Internal diff --git a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp index 893c1809605..bf3de189062 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp @@ -80,7 +80,7 @@ Utils::UniqueObjectPtr<QToolBar> ToolBar::create() quickWidget->quickWidget()->setObjectName(Constants::OBJECT_NAME_TOP_TOOLBAR); - quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toString() + "/imports"); + quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toUrlishString() + "/imports"); Utils::FilePath qmlFilePath = qmlSourcesPath() / "Main.qml"; QTC_ASSERT(qmlFilePath.exists(), return nullptr); @@ -111,7 +111,7 @@ Utils::UniqueObjectPtr<QWidget> ToolBar::createStatusBar() quickWidget->quickWidget()->setObjectName(Constants::OBJECT_NAME_STATUSBAR); - quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toString() + "/imports"); + quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toUrlishString() + "/imports"); Utils::FilePath qmlFilePath = qmlSourcesStatusBarPath().pathAppended("/Main.qml"); QTC_ASSERT(qmlFilePath.exists(), return nullptr); diff --git a/src/plugins/qmldesigner/designermcumanager.cpp b/src/plugins/qmldesigner/designermcumanager.cpp index 503f1ceee4e..e42c28ac3ef 100644 --- a/src/plugins/qmldesigner/designermcumanager.cpp +++ b/src/plugins/qmldesigner/designermcumanager.cpp @@ -42,7 +42,7 @@ DesignerMcuManager &DesignerMcuManager::instance() QString DesignerMcuManager::mcuResourcesPath() { - return Core::ICore::resourcePath("qmldesigner/qt4mcu").toString(); + return Core::ICore::resourcePath("qmldesigner/qt4mcu").toUrlishString(); } bool DesignerMcuManager::isMCUProject() const diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 336cd192cc4..34183af8b26 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -224,7 +224,7 @@ void DesignModeWidget::setup() m_dockManager->setLiteMode(QmlDesignerBasePlugin::isLiteModeEnabled()); m_dockManager->setSettings(settings); m_dockManager->setWorkspacePresetsPath( - Core::ICore::resourcePath("qmldesigner/workspacePresets/").toString()); + Core::ICore::resourcePath("qmldesigner/workspacePresets/").toUrlishString()); QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/dockwidgets.css")); m_dockManager->setStyleSheet(Theme::replaceCssColors(sheet)); @@ -685,9 +685,9 @@ void DesignModeWidget::setupNavigatorHistory(Core::IEditor *editor) void DesignModeWidget::addNavigatorHistoryEntry(const Utils::FilePath &fileName) { if (m_navigatorHistoryCounter > 0) - m_navigatorHistory.insert(m_navigatorHistoryCounter + 1, fileName.toString()); + m_navigatorHistory.insert(m_navigatorHistoryCounter + 1, fileName.toUrlishString()); else - m_navigatorHistory.append(fileName.toString()); + m_navigatorHistory.append(fileName.toUrlishString()); ++m_navigatorHistoryCounter; } diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 9fbb7e5ef84..c650c42713e 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -234,7 +234,7 @@ void DocumentManager::setCurrentDesignDocument(Core::IEditor *editor) auto found = m_designDocuments.find(editor); if (found == m_designDocuments.end()) { auto &inserted = m_designDocuments[editor] = std::make_unique<DesignDocument>( - editor->document()->filePath().toString(), + editor->document()->filePath().toUrlishString(), m_projectManager.projectStorageDependencies(), m_externalDependencies); m_currentDesignDocument = inserted.get(); @@ -362,7 +362,7 @@ Utils::FilePath DocumentManager::currentProjectDirPath() const QList projects = ProjectExplorer::ProjectManager::projects(); for (auto p : projects) { - if (qmlFileName.startsWith(p->projectDirectory().toString())) + if (qmlFileName.startsWith(p->projectDirectory().toUrlishString())) return p->projectDirectory(); } @@ -458,7 +458,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, qCDebug(documentManagerLog) << "Found" << isoIconsQrcFile << "in" << virtualFolderNode->filePath(); iconQrcFileNode = subFolderNode; - *resourceFileProPath = iconQrcFileNode->parentProjectNode()->filePath().toString(); + *resourceFileProPath = iconQrcFileNode->parentProjectNode()->filePath().toUrlishString(); } } } @@ -474,14 +474,14 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists, if (!iconQrcFileNode) { // The QRC file that we want doesn't exist or is not listed under RESOURCES in the .pro. if (project) - *resourceFilePath = project->projectDirectory().toString() + "/" + isoIconsQrcFile; + *resourceFilePath = project->projectDirectory().toUrlishString() + "/" + isoIconsQrcFile; // We assume that the .pro containing the QML file is an acceptable place to add the .qrc file. ProjectExplorer::ProjectNode *projectNode = ProjectExplorer::ProjectTree::nodeForFile(qmlFileName)->parentProjectNode(); - *resourceFileProPath = projectNode->filePath().toString(); + *resourceFileProPath = projectNode->filePath().toUrlishString(); } else { // We found the QRC file that we want. - QString projectDirectory = ProjectExplorer::ProjectTree::projectForNode(iconQrcFileNode)->projectDirectory().toString(); + QString projectDirectory = ProjectExplorer::ProjectTree::projectForNode(iconQrcFileNode)->projectDirectory().toUrlishString(); *resourceFilePath = projectDirectory + "/" + isoIconsQrcFile; } diff --git a/src/plugins/qmldesigner/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/instances/nodeinstanceview.cpp index f0af9d8e8e1..e34b9bde5f7 100644 --- a/src/plugins/qmldesigner/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/instances/nodeinstanceview.cpp @@ -2341,7 +2341,7 @@ void NodeInstanceView::handleShaderChanges() QStringList args = baseArgs; args.append("-o"); - args.append(outPath.toString()); + args.append(outPath.toUrlishString()); args.append(shader); auto qsbProcess = new Utils::Process(this); connect(qsbProcess, &Utils::Process::done, this, [this, qsbProcess, shader] { diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/metainfo.cpp index 002c07441f1..75e7cf04317 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/metainfo.cpp @@ -36,7 +36,7 @@ static QString globalMetaInfoPath(const ExternalDependenciesInterface &externalD if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE")) return QLatin1String(SHARE_QML_PATH) + "/globalMetaInfo"; #endif - return externalDependecies.resourcePath("qmldesigner/globalMetaInfo").toString(); + return externalDependecies.resourcePath("qmldesigner/globalMetaInfo").toUrlishString(); } Utils::FilePaths allGlobalMetaInfoFiles(const ExternalDependenciesInterface &externalDependecies) @@ -125,11 +125,11 @@ void MetaInfoPrivate::parseItemLibraryDescriptions(const ExternalDependenciesInt for (const Utils::FilePath &path : allMetaInfoFiles) { Internal::MetaInfoReader reader(*m_q); try { - reader.readMetaInfoFile(path.toString()); + reader.readMetaInfoFile(path.toUrlishString()); } catch ([[maybe_unused]] const InvalidMetaInfoException &e) { #ifndef UNIT_TESTS qWarning() << e.description(); - const QString errorMessage = path.toString() + QLatin1Char('\n') + QLatin1Char('\n') + const QString errorMessage = path.toUrlishString() + QLatin1Char('\n') + QLatin1Char('\n') + reader.errors().join(QLatin1Char('\n')); QMessageBox::warning(nullptr, DesignerCore::Tr::tr("Invalid meta info."), diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp index e5000fe4083..09b19a320b9 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp @@ -1232,7 +1232,7 @@ QString NodeMetaInfoPrivate::componentFileName() const int line; int column; if (astObjectValue->getSourceLocation(&fileName, &line, &column)) - return fileName.toString(); + return fileName.toUrlishString(); } } return QString(); diff --git a/src/plugins/qmldesigner/libs/designercore/rewriter/texttomodelmerger.cpp b/src/plugins/qmldesigner/libs/designercore/rewriter/texttomodelmerger.cpp index 9d39d093f07..47fc59ac425 100644 --- a/src/plugins/qmldesigner/libs/designercore/rewriter/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/libs/designercore/rewriter/texttomodelmerger.cpp @@ -875,7 +875,7 @@ void TextToModelMerger::setupPossibleImports() auto modules = m_possibleModules; if (document()->fileName() != "<internal>") - modules.append(generatePossibleFileImports(document()->path().toString(), allUsedImports)); + modules.append(generatePossibleFileImports(document()->path().toUrlishString(), allUsedImports)); if (m_rewriterView->isAttached()) m_rewriterView->model()->setPossibleImports(modules); @@ -2240,7 +2240,7 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings( check.enableQmlDesignerChecks(); - QUrl fileNameUrl = QUrl::fromLocalFile(m_document->fileName().toString()); + QUrl fileNameUrl = QUrl::fromLocalFile(m_document->fileName().toUrlishString()); const QList<StaticAnalysis::Message> messages = check(); for (const StaticAnalysis::Message &message : messages) { if (message.severity == Severity::Error) { diff --git a/src/plugins/qmldesigner/libs/designsystem/dsstore.cpp b/src/plugins/qmldesigner/libs/designsystem/dsstore.cpp index 411371e8883..7749a5a5d2e 100644 --- a/src/plugins/qmldesigner/libs/designsystem/dsstore.cpp +++ b/src/plugins/qmldesigner/libs/designsystem/dsstore.cpp @@ -161,8 +161,8 @@ std::optional<QString> DSStore::save(bool mcuCompatible) std::optional<QString> DSStore::save(const Utils::FilePath &moduleDirPath, bool mcuCompatible) { - if (!QDir().mkpath(moduleDirPath.absoluteFilePath().toString())) - return tr("Can not create design system module directory %1.").arg(moduleDirPath.toString()); + if (!QDir().mkpath(moduleDirPath.absoluteFilePath().toUrlishString())) + return tr("Can not create design system module directory %1.").arg(moduleDirPath.toUrlishString()); // dump collections QStringList singletons; diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp b/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp index e11a46fe7cf..0b37996b8c9 100644 --- a/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp +++ b/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp @@ -24,7 +24,7 @@ FileExtractor::FileExtractor(QObject *parent) QObject::connect(this, &FileExtractor::targetFolderExistsChanged, this, [this] { if (targetFolderExists()) - m_birthTime = QFileInfo(m_targetPath.toString() + "/" + m_archiveName).birthTime(); + m_birthTime = QFileInfo(m_targetPath.toUrlishString() + "/" + m_archiveName).birthTime(); else m_birthTime = QDateTime(); @@ -93,12 +93,12 @@ void FileExtractor::setTargetPath(const QString &path) removeTempTargetPath(); m_targetPath = FilePath::fromString(path); - QDir dir(m_targetPath.toString()); + QDir dir(m_targetPath.toUrlishString()); if (!path.isEmpty() && !dir.exists()) { // Even though m_targetPath will be created eventually, we need to make sure the path exists // before m_bytesBefore is being calculated. - dir.mkpath(m_targetPath.toString()); + dir.mkpath(m_targetPath.toUrlishString()); } } @@ -179,7 +179,7 @@ QString FileExtractor::count() const bool FileExtractor::targetFolderExists() const { - return QFileInfo::exists(m_targetPath.toString() + "/" + m_archiveName); + return QFileInfo::exists(m_targetPath.toUrlishString() + "/" + m_archiveName); } int FileExtractor::progress() const @@ -199,7 +199,7 @@ QString FileExtractor::archiveName() const QString FileExtractor::sourceFile() const { - return m_sourceFile.toString(); + return m_sourceFile.toUrlishString(); } void FileExtractor::extract() @@ -212,7 +212,7 @@ void FileExtractor::extract() m_isTempTargetPath = true; } - m_targetFolder = m_targetPath.toString() + "/" + m_archiveName; + m_targetFolder = m_targetPath.toUrlishString() + "/" + m_archiveName; // If the target directory already exists, remove it and its content @@ -235,7 +235,7 @@ void FileExtractor::extract() m_timer.start(); m_bytesBefore = QStorageInfo(m_targetPath.toFileInfo().dir()).bytesAvailable(); - m_compressedSize = QFileInfo(m_sourceFile.toString()).size(); + m_compressedSize = QFileInfo(m_sourceFile.toUrlishString()).size(); if (m_compressedSize <= 0) qWarning() << "Compressed size for file '" << m_sourceFile << "' is zero or invalid: " << m_compressedSize; @@ -262,7 +262,7 @@ void FileExtractor::extract() void QmlDesigner::FileExtractor::removeTempTargetPath() { if (m_isTempTargetPath && m_targetPath.exists()) { - QTC_ASSERT(m_targetPath.toString().startsWith(QDir::tempPath()), qDebug() << m_targetPath; + QTC_ASSERT(m_targetPath.toUrlishString().startsWith(QDir::tempPath()), qDebug() << m_targetPath; return ); m_targetPath.removeRecursively(); m_isTempTargetPath = false; diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp index edf8aee6198..c7488558831 100644 --- a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp +++ b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp @@ -97,7 +97,7 @@ QString PuppetEnvironmentBuilder::getStyleConfigFileName() const envVar->value, &Utils::FilePath::fileName); if (foundFile != std::end(sourceFiles)) - return foundFile->toString(); + return foundFile->toUrlishString(); } } } @@ -199,7 +199,7 @@ void PuppetEnvironmentBuilder::addMultiLanguageDatatbase() const const auto databaseFilePath = multiLanguageAspect->databaseFilePath(); if (!databaseFilePath.isEmpty() && databaseFilePath.exists()) m_environment.set("QT_MULTILANGUAGE_DATABASE", - multiLanguageAspect->databaseFilePath().toString()); + multiLanguageAspect->databaseFilePath().toUrlishString()); } } diff --git a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp index f2ad1163e9e..1713d6fe8e1 100644 --- a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp +++ b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp @@ -29,7 +29,7 @@ double ExternalDependencies::formEditorDevicePixelRatio() const QString ExternalDependencies::defaultPuppetFallbackDirectory() const { - return Core::ICore::libexecPath().toString(); + return Core::ICore::libexecPath().toUrlishString(); } QString ExternalDependencies::qmlPuppetFallbackDirectory() const @@ -44,14 +44,14 @@ QString ExternalDependencies::qmlPuppetFallbackDirectory() const QString ExternalDependencies::defaultPuppetToplevelBuildDirectory() const { - return Core::ICore::userResourcePath("qmlpuppet/").toString(); + return Core::ICore::userResourcePath("qmlpuppet/").toUrlishString(); } QUrl ExternalDependencies::projectUrl() const { DesignDocument *document = QmlDesignerPlugin::instance()->viewManager().currentDesignDocument(); if (document) - return QUrl::fromLocalFile(document->projectFolder().toString()); + return QUrl::fromLocalFile(document->projectFolder().toUrlishString()); return {}; } @@ -63,7 +63,7 @@ QString ExternalDependencies::projectName() const QString ExternalDependencies::currentProjectDirPath() const { - return QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toString(); + return QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath().toUrlishString(); } QUrl ExternalDependencies::currentResourcePath() const @@ -155,8 +155,8 @@ PuppetStartData ExternalDependencies::puppetStartData(const Model &model) const auto target = ProjectExplorer::ProjectManager::startupTarget(); auto [workingDirectory, puppetPath] = QmlPuppetPaths::qmlPuppetPaths(target, m_designerSettings); - data.puppetPath = puppetPath.toString(); - data.workingDirectoryPath = workingDirectory.toString(); + data.puppetPath = puppetPath.toUrlishString(); + data.workingDirectoryPath = workingDirectory.toUrlishString(); data.environment = PuppetEnvironmentBuilder::createEnvironment(target, m_designerSettings, model, qmlPuppetPath()); data.debugPuppet = m_designerSettings.value(DesignerSettingsKey::DEBUG_PUPPET).toString(); data.freeTypeOption = createFreeTypeOption(target); @@ -190,7 +190,7 @@ QString qmlPath(ProjectExplorer::Target *target) if (!qtVersion) return {}; - return qtVersion->qmlPath().toString(); + return qtVersion->qmlPath().toUrlishString(); } std::tuple<ProjectExplorer::Project *, ProjectExplorer::Target *, QmlProjectManager::QmlBuildSystem *> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 920dd35690f..61dfb8adf45 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -287,7 +287,7 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString * } Sqlite::LibraryInitializer::initialize(); - QDir{}.mkpath(Core::ICore::cacheResourcePath().toString()); + QDir{}.mkpath(Core::ICore::cacheResourcePath().toUrlishString()); QAction *action = new QAction(tr("Give Feedback..."), this); Core::Command *cmd = Core::ActionManager::registerAction(action, "Help.GiveFeedback"); @@ -306,7 +306,7 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString * const QString fontPath = Core::ICore::resourcePath( "qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf") - .toString(); + .toUrlishString(); if (QFontDatabase::addApplicationFont(fontPath) < 0) qCWarning(qmldesignerLog) << "Could not add font " << fontPath << "to font database"; @@ -388,7 +388,7 @@ static QStringList allUiQmlFilesforCurrentProject(const Utils::FilePath &fileNam const QList<Utils::FilePath> fileNames = currentProject->files(ProjectExplorer::Project::SourceFiles); for (const Utils::FilePath &fileName : fileNames) { if (fileName.endsWith(".ui.qml")) - list.append(fileName.toString()); + list.append(fileName.toUrlishString()); } } @@ -401,7 +401,7 @@ static QString projectPath(const Utils::FilePath &fileName) ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectManager::projectForFile(fileName); if (currentProject) - path = currentProject->projectDirectory().toString(); + path = currentProject->projectDirectory().toUrlishString(); return path; } @@ -844,7 +844,7 @@ void QmlDesignerPlugin::lauchFeedbackPopupInternal(const QString &identifier) m_feedbackWidget = new QQuickWidget(Core::ICore::dialogParent()); m_feedbackWidget->setObjectName(Constants::OBJECT_NAME_TOP_FEEDBACK); - const QString qmlPath = Core::ICore::resourcePath("qmldesigner/feedback/FeedbackPopup.qml").toString(); + const QString qmlPath = Core::ICore::resourcePath("qmldesigner/feedback/FeedbackPopup.qml").toUrlishString(); m_feedbackWidget->setSource(QUrl::fromLocalFile(qmlPath)); if (!m_feedbackWidget->errors().isEmpty()) { diff --git a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp index faf59f62c77..f79e451dc51 100644 --- a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp +++ b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp @@ -64,12 +64,12 @@ ProjectExplorer::Target *activeTarget(ProjectExplorer::Project *project) QString previewDefaultImagePath() { - return Core::ICore::resourcePath("qmldesigner/welcomepage/images/newThumbnail.png").toString(); + return Core::ICore::resourcePath("qmldesigner/welcomepage/images/newThumbnail.png").toUrlishString(); } QString previewBrokenImagePath() { - return Core::ICore::resourcePath("qmldesigner/welcomepage/images/noPreview.png").toString(); + return Core::ICore::resourcePath("qmldesigner/welcomepage/images/noPreview.png").toUrlishString(); } ::QmlProjectManager::QmlBuildSystem *getQmlBuildSystem(::ProjectExplorer::Target *target) @@ -128,7 +128,7 @@ public: public: Sqlite::Database database{Utils::PathString{ - Core::ICore::cacheResourcePath("imagecache-v2.db").toString()}, + Core::ICore::cacheResourcePath("imagecache-v2.db").toUrlishString()}, Sqlite::JournalMode::Wal, Sqlite::LockingMode::Normal}; ImageCacheStorage<Sqlite::Database> storage{database}; @@ -162,7 +162,7 @@ public: public: Sqlite::Database database{Utils::PathString{ - Core::ICore::cacheResourcePath("previewcache.db").toString()}, + Core::ICore::cacheResourcePath("previewcache.db").toUrlishString()}, Sqlite::JournalMode::Wal, Sqlite::LockingMode::Normal}; ImageCacheStorage<Sqlite::Database> storage{database}; @@ -179,13 +179,13 @@ class ProjectStorageData { public: ProjectStorageData(::ProjectExplorer::Project *project, PathCacheType &pathCache) - : database{project->projectDirectory().pathAppended("projectstorage.db").toString()} + : database{project->projectDirectory().pathAppended("projectstorage.db").toUrlishString()} , errorNotifier{pathCache} , fileSystem{pathCache} , qmlDocumentParser{storage, pathCache} , pathWatcher{pathCache, fileSystem, &updater} , projectPartId{ProjectPartId::create( - pathCache.sourceId(SourcePath{project->projectDirectory().toString() + "/."}).internalId())} + pathCache.sourceId(SourcePath{project->projectDirectory().toUrlishString() + "/."}).internalId())} , updater{fileSystem, storage, fileStatusCache, @@ -437,7 +437,7 @@ QString qmlPath(::ProjectExplorer::Target *target) qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes"); qmldirPaths.append( - Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toString()); + Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toUrlishString()); return qmldirPaths; } @@ -453,7 +453,7 @@ QString qmlPath(::ProjectExplorer::Target *target) qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes"); qmldirPaths.append( - Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toString()); + Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toUrlishString()); return qmldirPaths; } @@ -465,12 +465,12 @@ QString propertyEditorResourcesPath() return QLatin1String(SHARE_QML_PATH) + "/propertyEditorQmlSources"; } #endif - return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toString(); + return Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources").toUrlishString(); } QString qtCreatorItemLibraryPath() { - return Core::ICore::resourcePath("qmldesigner/itemLibrary").toString(); + return Core::ICore::resourcePath("qmldesigner/itemLibrary").toUrlishString(); } } // namespace @@ -517,7 +517,7 @@ void QmlDesignerProjectManager::generatePreview() if (qmlBuildSystem) { m_previewImageCacheData->collector.setTarget(m_projectData->activeTarget); - m_previewImageCacheData->factory.generate(qmlBuildSystem->mainFilePath().toString().toUtf8()); + m_previewImageCacheData->factory.generate(qmlBuildSystem->mainFilePath().toUrlishString().toUtf8()); } } diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp index c32848c8c13..57edcd0096a 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp @@ -136,7 +136,7 @@ void QmlPreviewWidgetPlugin::setQmlFile() const Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName(); bool hasPreviewedFile = - s_previewPlugin->setProperty("previewedFile", qmlFileName.toString()); + s_previewPlugin->setProperty("previewedFile", qmlFileName.toUrlishString()); QTC_CHECK(hasPreviewedFile); } } diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 61c18dcae3d..2f81aa30d60 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -345,7 +345,7 @@ QHash<QByteArray, QVariant> SettingsPageWidget::newSettings() const settings.insert(DesignerSettingsKey::DEBUG_PUPPET, m_debugPuppetComboBox->currentText()); - QString newFallbackPuppetPath = m_fallbackPuppetPathLineEdit->filePath().toString(); + QString newFallbackPuppetPath = m_fallbackPuppetPathLineEdit->filePath().toUrlishString(); QTC_CHECK(m_externalDependencies.defaultPuppetFallbackDirectory() == m_fallbackPuppetPathLineEdit->lineEdit()->placeholderText()); if (newFallbackPuppetPath.isEmpty()) @@ -363,10 +363,10 @@ QHash<QByteArray, QVariant> SettingsPageWidget::newSettings() const } if (!m_puppetBuildPathLineEdit->filePath().isEmpty() - && m_puppetBuildPathLineEdit->filePath().toString() + && m_puppetBuildPathLineEdit->filePath().toUrlishString() != m_externalDependencies.defaultPuppetToplevelBuildDirectory()) { settings.insert(DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY, - m_puppetBuildPathLineEdit->filePath().toString()); + m_puppetBuildPathLineEdit->filePath().toUrlishString()); } settings.insert(DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR, m_alwaysSaveSubcomponentsCheckBox->isChecked()); diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 8292a830bd2..a3a3c5d751f 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -143,7 +143,7 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex QPixmap pixmap = Core::ICore::mainWindow()->grab(); - const bool b = pixmap.save(file.toString(), "PNG"); + const bool b = pixmap.save(file.toUrlishString(), "PNG"); qWarning() << "screenshot" << file << b << pixmap; }); diff --git a/src/plugins/qmldesigner/textmodifier/basetexteditmodifier.cpp b/src/plugins/qmldesigner/textmodifier/basetexteditmodifier.cpp index 5ae82c06b39..44d96462f9c 100644 --- a/src/plugins/qmldesigner/textmodifier/basetexteditmodifier.cpp +++ b/src/plugins/qmldesigner/textmodifier/basetexteditmodifier.cpp @@ -99,7 +99,7 @@ bool BaseTextEditModifier::moveToComponent(int nodeOffset, const QString &import QmlJSEditor::performComponentFromObjectDef(qobject_cast<QmlJSEditor::QmlJSEditorWidget *>( m_textEdit), - document->filePath().toString(), + document->filePath().toUrlishString(), object, importData); return true; diff --git a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp index 8c0ec704174..f7b5185339f 100644 --- a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp +++ b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp @@ -203,14 +203,14 @@ void StudioSettingsPage::apply() } QtcSettings *s = Core::ICore::settings(); - const QString value = m_pathChooserExamples->filePath().toString(); + const QString value = m_pathChooserExamples->filePath().toUrlishString(); if (s->value(Paths::exampleDownloadPath, false).toString() != value) { s->setValue(Paths::exampleDownloadPath, value); emit examplesDownloadPathChanged(value); } - const QString bundlesPath = m_pathChooserBundles->filePath().toString(); + const QString bundlesPath = m_pathChooserBundles->filePath().toUrlishString(); if (s->value(Paths::bundlesDownloadPath).toString() != bundlesPath) { s->setValue(Paths::bundlesDownloadPath, bundlesPath); diff --git a/src/plugins/qmldesignerbase/utils/designerpaths.cpp b/src/plugins/qmldesignerbase/utils/designerpaths.cpp index f938c58e04c..9a2db3aa4aa 100644 --- a/src/plugins/qmldesignerbase/utils/designerpaths.cpp +++ b/src/plugins/qmldesignerbase/utils/designerpaths.cpp @@ -28,13 +28,13 @@ Utils::FilePath defaultBundlesPath() QString examplesPathSetting() { - return Core::ICore::settings()->value(exampleDownloadPath, defaultExamplesPath().toString()) + return Core::ICore::settings()->value(exampleDownloadPath, defaultExamplesPath().toUrlishString()) .toString(); } QString bundlesPathSetting() { - return Core::ICore::settings()->value(bundlesDownloadPath, defaultBundlesPath().toString()) + return Core::ICore::settings()->value(bundlesDownloadPath, defaultBundlesPath().toUrlishString()) .toString(); } diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index e4d6af4afca..d5fa636dcd3 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -620,7 +620,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::performAsync() if (contextFinder.isInImport()) { QStringList patterns; patterns << QLatin1String("*.qml") << QLatin1String("*.js"); - if (completeFileName(document->path().toString(), literalText, patterns)) + if (completeFileName(document->path().toUrlishString(), literalText, patterns)) return createContentProposal(); return nullptr; } @@ -630,7 +630,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::performAsync() if (!value) { // do nothing } else if (value->asUrlValue()) { - if (completeUrl(document->path().toString(), literalText)) + if (completeUrl(document->path().toUrlishString(), literalText)) return createContentProposal(); } diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp index ce6473b9880..60fc563295a 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp @@ -169,7 +169,7 @@ public: if (!refactoring.file(newFileName)->create(newComponentSource, reindent, openEditor)) return; - if (path.toString() == currentFileName.toFileInfo().path()) { + if (path.toUrlishString() == currentFileName.toFileInfo().path()) { // hack for the common case, next version should use the wizard ProjectExplorer::Node *oldFileNode = ProjectExplorer::ProjectTree::nodeForFile( currentFileName); @@ -196,14 +196,14 @@ public: const QMessageBox::StandardButton button = QMessageBox::question( Core::ICore::dialogParent(), Core::VcsManager::msgAddToVcsTitle(), - Core::VcsManager::msgPromptToAddToVcs(QStringList(newFileName.toString()), + Core::VcsManager::msgPromptToAddToVcs(QStringList(newFileName.toUrlishString()), versionControl), QMessageBox::Yes | QMessageBox::No); if (button == QMessageBox::Yes && !versionControl->vcsAdd(newFileName)) { QMessageBox::warning(Core::ICore::dialogParent(), Core::VcsManager::msgAddToVcsFailedTitle(), Core::VcsManager::msgToAddToVcsFailed( - QStringList(newFileName.toString()), versionControl)); + QStringList(newFileName.toUrlishString()), versionControl)); } } } diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp index 4917e8c59ac..b7d4fb9c5a0 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp @@ -91,7 +91,7 @@ bool ComponentNameDialog::go(QString *proposedName, if (QDialog::Accepted == d.exec()) { *proposedName = d.m_componentNameEdit->text(); - *proposedPath = d.m_pathEdit->filePath().toString(); + *proposedPath = d.m_pathEdit->filePath().toUrlishString(); if (d.m_checkBox->isChecked()) *proposedSuffix = "ui.qml"; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 7bb446ab9f2..68db9840d44 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -81,8 +81,8 @@ public: QPointer<QmlJSEditorDocument> m_currentDocument; QmlJS::JsonSchemaManager m_jsonManager{ - {ICore::userResourcePath("json/").toString(), - ICore::resourcePath("json/").toString()}}; + {ICore::userResourcePath("json/").toUrlishString(), + ICore::resourcePath("json/").toUrlishString()}}; QmlJsEditingSettingsPage m_qmJSEditingSettingsPage; }; diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index 9e8a4ecdcb3..225eba5f1e8 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -986,7 +986,7 @@ void FindReferences::displayResults(int first, int last) // the first usage is always a dummy to indicate we now start searching if (first == 0) { Usage dummy = m_watcher.future().resultAt(0); - const QString replacement = dummy.path.toString(); + const QString replacement = dummy.path.toUrlishString(); const QString symbolName = dummy.lineText; const QString label = Tr::tr("QML/JS Usages:"); diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index cf61970974e..0f2b40a0c73 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -356,7 +356,7 @@ void QmlJSHoverHandler::handleImport(const ScopeChain &scopeChain, AST::UiImport if (import.info.ast() == node) { if (import.info.type() == ImportType::Library && !import.libraryPath.isEmpty()) { - QString msg = Tr::tr("Library at %1").arg(import.libraryPath.toString()); + QString msg = Tr::tr("Library at %1").arg(import.libraryPath.toUrlishString()); const LibraryInfo &libraryInfo = scopeChain.context()->snapshot().libraryInfo(import.libraryPath); if (libraryInfo.pluginTypeInfoStatus() == LibraryInfo::DumpDone) { msg += QLatin1Char('\n'); diff --git a/src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp b/src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp index de36b64d55b..00001709ab6 100644 --- a/src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp +++ b/src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp @@ -96,7 +96,7 @@ QmlJSTools::SemanticInfo SemanticInfoUpdater::makeNewSemanticInfo(const QmlJS::D if (doc->language() == Dialect::Json) { JsonSchema *schema = jsonManager()->schemaForFile( - doc->fileName().toString()); + doc->fileName().toUrlishString()); if (schema) { JsonCheck jsonChecker(doc); semanticInfo.staticAnalysisMessages = jsonChecker(schema); diff --git a/src/plugins/qmljseditor/qmllsclientsettings.cpp b/src/plugins/qmljseditor/qmllsclientsettings.cpp index 74fe77fe183..6254958b494 100644 --- a/src/plugins/qmljseditor/qmllsclientsettings.cpp +++ b/src/plugins/qmljseditor/qmllsclientsettings.cpp @@ -190,7 +190,7 @@ Client *QmllsClientSettings::createClient(BaseClientInterface *interface) const auto qmllsInterface = static_cast<QmllsClientInterface *>(interface); auto client = new QmllsClient(qmllsInterface); const QString name = QString("%1 (%2)").arg( - Utils::globalMacroExpander()->expand(m_name), qmllsInterface->qmllsFilePath().toString()); + Utils::globalMacroExpander()->expand(m_name), qmllsInterface->qmllsFilePath().toUrlishString()); client->setName(name); return client; } diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp index 9f156807742..10636a57257 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.cpp +++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp @@ -319,7 +319,7 @@ QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *document) : m_editorDocument(document) { m_icons = Icons::instance(); - Icons::instance()->setIconFilesPath(Core::ICore::resourcePath("qmlicons").toString()); + Icons::instance()->setIconFilesPath(Core::ICore::resourcePath("qmlicons").toUrlishString()); setItemPrototype(new QmlOutlineItem(this)); } diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 9ef6910977d..49886d384ef 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -205,7 +205,7 @@ void QuickToolBar::apply(TextEditor::TextEditorWidget *editorWidget, Document::P else contextWidget()->rePosition(p3 , p1, p2, settings().pinContextPane()); contextWidget()->setOptions(settings().enableContextPane(), settings().pinContextPane()); - contextWidget()->setPath(document->path().toString()); + contextWidget()->setPath(document->path().toUrlishString()); contextWidget()->setProperties(&propertyReader); m_doc = document; m_node = node; diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp index a3fc072c996..b600704f469 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.cpp +++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp @@ -40,7 +40,7 @@ QmlBundle BasicBundleProvider::defaultBundle(const QString &bundleInfoName, } QStringList errors; bool stripVersions = qtVersion && qtVersion->qtVersion().majorVersion() > 5; - if (!res.readFrom(defaultBundlePath.toString(), stripVersions, &errors) && !wroteErrors) { + if (!res.readFrom(defaultBundlePath.toUrlishString(), stripVersions, &errors) && !wroteErrors) { qWarning() << "BasicBundleProvider: ERROR reading " << defaultBundlePath << " : " << errors; wroteErrors = true; @@ -93,7 +93,7 @@ void BasicBundleProvider::mergeBundlesForKit(ProjectExplorer::Kit *kit bundles.mergeBundleForLanguage(Dialect::QmlQtQuick2Ui, b2); return; } - QString qtQmlPath = qtVersion->qmlPath().toString(); + QString qtQmlPath = qtVersion->qmlPath().toUrlishString(); myReplacements.insert(QLatin1String("$(CURRENT_DIRECTORY)"), qtQmlPath); QDir qtQuick2Bundles(qtQmlPath); diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index b724566c567..4b97b3eaab2 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -61,7 +61,7 @@ static void setupProjectInfoQmlBundles(ModelManagerInterface::ProjectInfo &proje if (projectInfo.project) activeTarget = projectInfo.project->activeTarget(); Kit *activeKit = activeTarget ? activeTarget->kit() : KitManager::defaultKit(); - const QHash<QString, QString> replacements = {{QLatin1String("$(QT_INSTALL_QML)"), projectInfo.qtQmlPath.toString()}}; + const QHash<QString, QString> replacements = {{QLatin1String("$(QT_INSTALL_QML)"), projectInfo.qtQmlPath.toUrlishString()}}; for (IBundleProvider *bp : IBundleProvider::allBundleProviders()) bp->mergeBundlesForKit(activeKit, projectInfo.activeBundle, replacements); @@ -296,8 +296,8 @@ void ModelManager::delayedInitialization() void ModelManager::loadDefaultQmlTypeDescriptions() { if (ICore::instance()) { - loadQmlTypeDescriptionsInternal(ICore::resourcePath().toString()); - loadQmlTypeDescriptionsInternal(ICore::userResourcePath().toString()); + loadQmlTypeDescriptionsInternal(ICore::resourcePath().toUrlishString()); + loadQmlTypeDescriptionsInternal(ICore::userResourcePath().toUrlishString()); } } diff --git a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp index 9b270478597..3cb78a01113 100644 --- a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp +++ b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp @@ -70,7 +70,7 @@ QUrl QmlPreviewConnectionManager::findValidI18nDirectoryAsUrl(const QString &loc auto tryPath = [&](const QString &postfix) { url.setPath(path + "/i18n/qml_" + postfix); bool success = false; - foundPath = m_projectFileFinder.findFile(url, &success).constFirst().toString(); + foundPath = m_projectFileFinder.findFile(url, &success).constFirst().toUrlishString(); foundPath = foundPath.left(qMax(0, foundPath.lastIndexOf("/i18n"))); return success; }; diff --git a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp index e1e2ca05f3e..cd7beaf7e79 100644 --- a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp +++ b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp @@ -48,7 +48,7 @@ QString QmlPreviewFileOnTargetFinder::findPath(const QString &filePath, bool *su // Try the current node first. It's likely that this is the one we're looking for and if there // is any ambiguity (same file mapped to multiple qrc paths) it should take precedence. ProjectExplorer::Node *currentNode = ProjectExplorer::ProjectTree::currentNode(); - if (currentNode && currentNode->filePath().toString() == filePath) { + if (currentNode && currentNode->filePath().toUrlishString() == filePath) { const QString path = resourceNodePath(currentNode); if (!path.isEmpty()) return path; @@ -58,7 +58,7 @@ QString QmlPreviewFileOnTargetFinder::findPath(const QString &filePath, bool *su if (ProjectExplorer::ProjectNode *rootNode = project->rootProjectNode()) { const QList<ProjectExplorer::Node *> nodes = rootNode->findNodes( [&](ProjectExplorer::Node *node) { - return node->filePath().toString() == filePath; + return node->filePath().toUrlishString() == filePath; }); for (const ProjectExplorer::Node *node : nodes) { diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index c60225607a8..1661136c32a 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -340,7 +340,7 @@ void QmlPreviewPlugin::previewCurrentFile() Tr::tr("Start the QML Preview for the project before selecting " "a specific file for preview.")); - const QString file = currentNode->filePath().toString(); + const QString file = currentNode->filePath().toUrlishString(); if (file != d->m_previewedFile) setPreviewedFile(file); else @@ -459,7 +459,7 @@ void QmlPreviewPluginPrivate::checkEditor() dialect = QmlJS::Dialect::QmlQtQuick2Ui; else dialect = QmlJS::Dialect::NoLanguage; - checkDocument(doc->filePath().toString(), doc->contents(), dialect); + checkDocument(doc->filePath().toUrlishString(), doc->contents(), dialect); } void QmlPreviewPluginPrivate::checkFile(const QString &fileName) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index ad2598aecce..d5e8ff91d48 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -301,7 +301,7 @@ int QmlProfilerModelManager::appendEventType(QmlEventType &&type) if (location.isValid()) { const RangeType rangeType = type.rangeType(); const QmlEventLocation localLocation(d->detailsRewriter->getLocalFile(location.filename()) - .toString(), + .toUrlishString(), location.line(), location.column()); @@ -332,7 +332,7 @@ void QmlProfilerModelManager::setEventType(int typeIndex, QmlEventType &&type) d->textMarkModel->addTextMarkId(typeIndex, QmlEventLocation(d->detailsRewriter ->getLocalFile(location.filename()) - .toString(), + .toUrlishString(), location.line(), location.column())); } diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 86942cad882..f3c2affd0cf 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -238,7 +238,7 @@ QmlProfilerTool::QmlProfilerTool() connect(editorManager, &EditorManager::editorCreated, model, [this, model](Core::IEditor *editor, const FilePath &filePath) { Q_UNUSED(editor) - model->createMarks(d->m_viewContainer, filePath.toString()); + model->createMarks(d->m_viewContainer, filePath.toUrlishString()); }); } @@ -495,7 +495,7 @@ void QmlProfilerTool::createInitialTextMarks() QmlProfilerTextMarkModel *model = d->m_profilerModelManager->textMarkModel(); const QList<IDocument *> documents = DocumentModel::openedDocuments(); for (IDocument *document : documents) - model->createMarks(d->m_viewContainer, document->filePath().toString()); + model->createMarks(d->m_viewContainer, document->filePath().toUrlishString()); } bool QmlProfilerTool::prepareTool() @@ -605,7 +605,7 @@ void QmlProfilerTool::showSaveDialog() filePath = filePath.stringAppended(zFile); saveLastTraceFile(filePath); Debugger::enableMainWindow(false); - Core::ProgressManager::addTask(d->m_profilerModelManager->save(filePath.toString()), + Core::ProgressManager::addTask(d->m_profilerModelManager->save(filePath.toUrlishString()), Tr::tr("Saving Trace Data"), TASK_SAVE, Core::ProgressManager::ShowInApplicationIcon); } @@ -631,7 +631,7 @@ void QmlProfilerTool::showLoadDialog() connect(d->m_profilerModelManager, &QmlProfilerModelManager::recordedFeaturesChanged, this, &QmlProfilerTool::setRecordedFeatures); d->m_profilerModelManager->populateFileFinder(); - Core::ProgressManager::addTask(d->m_profilerModelManager->load(filePath.toString()), + Core::ProgressManager::addTask(d->m_profilerModelManager->load(filePath.toUrlishString()), Tr::tr("Loading Trace Data"), TASK_LOAD); } } diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index 1aab728f4a4..2edbc145010 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -40,7 +40,7 @@ public: ProjectExplorer::FileType::Source); root->addNode(std::move(fileNode)); setRootProjectNode(std::move(root)); - setDisplayName(file.toString()); + setDisplayName(file.toUrlishString()); setId("QmlProfilerDetailsRewriterTest.DummyProject"); } diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp index 401b2e92097..b0a24715337 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp @@ -32,7 +32,7 @@ QmlProjectItem::QmlProjectItem(const Utils::FilePath &filePath, const bool skipR bool QmlProjectItem::initProjectObject() { if (m_projectFile.endsWith(Constants::fakeProjectName)) { - auto uiFile = m_projectFile.toString(); + auto uiFile = m_projectFile.toUrlishString(); uiFile.remove(Constants::fakeProjectName); auto parentDir = Utils::FilePath::fromString(uiFile).parentDir(); @@ -115,14 +115,14 @@ void QmlProjectItem::setupFileFilters() [](const QJsonValue &value) { return value.toString(); }); const QString directory = fileGroup["directory"].toString() == "" - ? m_projectFile.parentDir().toString() + ? m_projectFile.parentDir().toUrlishString() : fileGroup["directory"].toString(); Utils::FilePath groupDir = Utils::FilePath::fromString(directory); std::unique_ptr<FileFilterItem> fileFilterItem{new FileFilterItem}; fileFilterItem->setRecursive(false); fileFilterItem->setPathsProperty(filesArr); - fileFilterItem->setDefaultDirectory(m_projectFile.parentDir().toString()); - fileFilterItem->setDirectory(groupDir.toString()); + fileFilterItem->setDefaultDirectory(m_projectFile.parentDir().toUrlishString()); + fileFilterItem->setDirectory(groupDir.toUrlishString()); #ifndef TESTS_ENABLED_QMLPROJECTITEM connect(fileFilterItem.get(), &FileFilterItem::filesChanged, this, &QmlProjectItem::filesChanged); connect(fileFilterItem.get(), &FileFilterItem::fileModified, this, &QmlProjectItem::fileModified); diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp index 101a19e026e..e4564367e01 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp @@ -609,9 +609,9 @@ QVariant QmlBuildSystem::additionalData(Utils::Id id) const if (id == Constants::customQt6Project) return qt6Project(); if (id == Constants::mainFilePath) - return mainFilePath().toString(); + return mainFilePath().toUrlishString(); if (id == Constants::canonicalProjectDir) - return canonicalProjectDir().toString(); + return canonicalProjectDir().toUrlishString(); return {}; } @@ -639,7 +639,7 @@ bool QmlBuildSystem::addFiles(Node *context, const Utils::FilePaths &filePaths, Utils::FilePaths toAdd; for (const Utils::FilePath &filePath : filePaths) { - if (!m_projectItem->matchesFile(filePath.toString())) + if (!m_projectItem->matchesFile(filePath.toUrlishString())) toAdd << filePaths; } return toAdd.isEmpty(); diff --git a/src/plugins/qmlprojectmanager/qdslandingpage.cpp b/src/plugins/qmlprojectmanager/qdslandingpage.cpp index 62c3c5e1774..4ca4fa77f42 100644 --- a/src/plugins/qmlprojectmanager/qdslandingpage.cpp +++ b/src/plugins/qmlprojectmanager/qdslandingpage.cpp @@ -44,9 +44,9 @@ QQuickWidget *QdsLandingPageWidget::widget() m_widget = new QQuickWidget(); const QString resourcePath - = Core::ICore::resourcePath(QmlProjectManager::Constants::QML_RESOURCE_PATH).toString(); + = Core::ICore::resourcePath(QmlProjectManager::Constants::QML_RESOURCE_PATH).toUrlishString(); const QString landingPath - = Core::ICore::resourcePath(QmlProjectManager::Constants::LANDING_PAGE_PATH).toString(); + = Core::ICore::resourcePath(QmlProjectManager::Constants::LANDING_PAGE_PATH).toUrlishString(); QdsLandingPageTheme::setupTheme(m_widget->engine()); diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index fe8871b3103..7a0aca4e3a6 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -35,7 +35,7 @@ const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("QtC::QmlProjectManager", "<Curre static bool caseInsensitiveLessThan(const FilePath &s1, const FilePath &s2) { - return s1.toString().toCaseFolded() < s2.toString().toCaseFolded(); + return s1.toUrlishString().toCaseFolded() < s2.toUrlishString().toCaseFolded(); } QmlMainFileAspect::QmlMainFileAspect(AspectContainer *container) @@ -96,7 +96,7 @@ void QmlMainFileAspect::updateFileComboBox() if (mainScriptSource() == FileInProjectFile) { const FilePath mainScriptInFilePath = mainScript().relativePathFrom(projectDir); m_fileListModel.clear(); - m_fileListModel.appendRow(new QStandardItem(mainScriptInFilePath.toString())); + m_fileListModel.appendRow(new QStandardItem(mainScriptInFilePath.toUrlishString())); if (m_fileListCombo) m_fileListCombo->setEnabled(false); return; @@ -126,7 +126,7 @@ void QmlMainFileAspect::updateFileComboBox() if (fn.suffixView() != u"qml") continue; - auto item = new QStandardItem(fn.toString()); + auto item = new QStandardItem(fn.toUrlishString()); m_fileListModel.appendRow(item); if (mainScriptPath == fn) diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 6e8cfd8a827..0741d9eeec3 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -61,7 +61,7 @@ QmlProject::QmlProject(const Utils::FilePath &fileName) } if (fileName.endsWith(Constants::fakeProjectName)) { - auto uiFile = fileName.toString(); + auto uiFile = fileName.toUrlishString(); uiFile.remove(Constants::fakeProjectName); auto parentDir = Utils::FilePath::fromString(uiFile).parentDir(); diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakegenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakegenerator.cpp index 781b172867c..4209cd29851 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakegenerator.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakegenerator.cpp @@ -266,7 +266,7 @@ void CMakeGenerator::readQmlDir(const Utils::FilePath &filePath, NodePtr &node) else node->type = Node::Type::Module; - QFile f(filePath.toString()); + QFile f(filePath.toUrlishString()); f.open(QIODevice::ReadOnly); QTextStream stream(&f); diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakewriter.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakewriter.cpp index 4d94aaea26a..75a349321c5 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakewriter.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/cmakewriter.cpp @@ -110,7 +110,7 @@ QString CMakeWriter::readTemplate(const QString &templatePath) void CMakeWriter::writeFile(const Utils::FilePath &path, const QString &content) { - QFile fileHandle(path.toString()); + QFile fileHandle(path.toUrlishString()); if (fileHandle.open(QIODevice::WriteOnly | QIODevice::Text)) { QString cpy = content; cpy.replace("\t", " "); @@ -230,8 +230,8 @@ QString CMakeWriter::makeFindPackageBlock(const NodePtr &node, const QmlBuildSys QString CMakeWriter::makeRelative(const NodePtr &node, const Utils::FilePath &path) const { - const QString dir = node->dir.toString(); - return "\"" + Utils::FilePath::calcRelativePath(path.toString(), dir) + "\""; + const QString dir = node->dir.toUrlishString(); + return "\"" + Utils::FilePath::calcRelativePath(path.toUrlishString(), dir) + "\""; } QString CMakeWriter::makeQmlFilesBlock(const NodePtr &node) const @@ -395,7 +395,7 @@ bool CMakeWriter::hasMesh(const NodePtr &node) const bool CMakeWriter::hasQuick3dImport(const Utils::FilePath &filePath) const { - QFile f(filePath.toString()); + QFile f(filePath.toUrlishString()); if (!f.open(QIODevice::ReadOnly)) return false; diff --git a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp index 633c2365eb7..4ed6f67f14b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp @@ -64,7 +64,7 @@ bool QmlProjectFileGenerator::execute() const QString fileContent = QmlProjectExporter::CMakeWriter::readTemplate(QMLPROJECT_FILE_TEMPLATE_PATH) .arg(contentEntry, imageEntry, jsEntry, assetEntry, importPaths); - QFile file(m_targetFile.toString()); + QFile file(m_targetFile.toUrlishString()); file.open(QIODevice::WriteOnly); if (!file.isOpen()) return false; @@ -75,7 +75,7 @@ bool QmlProjectFileGenerator::execute() QMessageBox::information(Core::ICore::dialogParent(), Tr::tr("Project File Generated"), - Tr::tr("File created:\n\n%1").arg(m_targetFile.toString()), + Tr::tr("File created:\n\n%1").arg(m_targetFile.toUrlishString()), QMessageBox::Ok); return true; @@ -175,7 +175,7 @@ bool QmlProjectFileGenerator::isDirAcceptable(const FilePath &dir, const FilePat if (uiFileParentDir.isChildOf(dir)) { const FilePath relativePath = uiFileParentDir.relativeChildPath(dir); - QStringList components = relativePath.toString().split("/"); + QStringList components = relativePath.toUrlishString().split("/"); if (components.size() > 2) { QMessageBox::StandardButton sel = QMessageBox::question(Core::ICore::dialogParent(), Tr::tr("Problem"), @@ -234,7 +234,7 @@ const QStringList QmlProjectFileGenerator::findContentDirs(const QStringList &su if (fullPath == m_targetDir) relativePaths.append("."); else - relativePaths.append(fullPath.relativeChildPath(m_targetDir).toString().split('/').first()); + relativePaths.append(fullPath.relativeChildPath(m_targetDir).toUrlishString().split('/').first()); } return relativePaths; diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 5eca23749db..a8021bf53ea 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -109,9 +109,9 @@ void openQDS(const FilePath &fileName) //-a and -client arguments help to append project to open design studio application if (HostOsInfo::isMacHost()) qdsStarted = Process::startDetached( - {"/usr/bin/open", {"-a", qdsPath.path(), fileName.toString()}}); + {"/usr/bin/open", {"-a", qdsPath.path(), fileName.toUrlishString()}}); else - qdsStarted = Process::startDetached({qdsPath, {"-client", fileName.toString()}}); + qdsStarted = Process::startDetached({qdsPath, {"-client", fileName.toUrlishString()}}); if (!qdsStarted) { QMessageBox::warning(ICore::dialogParent(), @@ -412,7 +412,7 @@ void QmlProjectPlugin::initialize() return; const Utils::FilePath fileName = Utils::FilePath::fromString( - document->filePath().toString() + Constants::fakeProjectName); + document->filePath().toUrlishString() + Constants::fakeProjectName); auto result = ProjectExplorer::ProjectExplorerPlugin::openProjects( {fileName}); QTC_ASSERT(result.project(), return); diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index 8fa532d7f59..3de0058c13e 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -53,17 +53,17 @@ static QStringList searchPaths(Kit *kit) if (!qtVersion) return {}; - const QDir pluginDir(qtVersion->pluginPath().toString()); + const QDir pluginDir(qtVersion->pluginPath().toUrlishString()); const QStringList pluginSubDirs = pluginDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList searchPaths; for (const QString &dir : pluginSubDirs) - searchPaths << qtVersion->pluginPath().toString() + '/' + dir; + searchPaths << qtVersion->pluginPath().toUrlishString() + '/' + dir; - searchPaths << qtVersion->libraryPath().toString(); - searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/lib").toString(); - searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/usr/lib").toString(); + searchPaths << qtVersion->libraryPath().toUrlishString(); + searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/lib").toUrlishString(); + searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/usr/lib").toUrlishString(); return searchPaths; } @@ -93,7 +93,7 @@ public: mainLayout->insertLayout(mainLayout->count() - 2, formLayout); } - QString projectSource() const { return m_projectSource->filePath().toString(); } + QString projectSource() const { return m_projectSource->filePath().toUrlishString(); } FilePath localExecutable() const { return m_localExecutable->filePath(); } private: diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index dde9fa1d233..39c026811cd 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -382,15 +382,15 @@ QList<DeployableFile> QnxDeployQtLibrariesDialogPrivate::gatherFiles() QTC_ASSERT(qtVersion, return result); if (HostOsInfo::isWindowsHost()) { - result.append(gatherFiles(qtVersion->libraryPath().toString(), {}, {{"*.so.?"}})); - result.append(gatherFiles(qtVersion->libraryPath().toString() + QLatin1String("/fonts"))); + result.append(gatherFiles(qtVersion->libraryPath().toUrlishString(), {}, {{"*.so.?"}})); + result.append(gatherFiles(qtVersion->libraryPath().toUrlishString() + QLatin1String("/fonts"))); } else { - result.append(gatherFiles(qtVersion->libraryPath().toString())); + result.append(gatherFiles(qtVersion->libraryPath().toUrlishString())); } - result.append(gatherFiles(qtVersion->pluginPath().toString())); - result.append(gatherFiles(qtVersion->importsPath().toString())); - result.append(gatherFiles(qtVersion->qmlPath().toString())); + result.append(gatherFiles(qtVersion->pluginPath().toUrlishString())); + result.append(gatherFiles(qtVersion->importsPath().toUrlishString())); + result.append(gatherFiles(qtVersion->qmlPath().toUrlishString())); return result; } diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 3d228c0d2bb..c81a14844e3 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -93,7 +93,7 @@ public: Store toMap() const { Store data; - data.insert(QNXEnvFileKey, m_envFile.toString()); + data.insert(QNXEnvFileKey, m_envFile.toUrlishString()); data.insert(QNXVersionKey, m_version.toString()); return data; } @@ -276,7 +276,7 @@ void QnxConfiguration::createKit(const QnxTarget &target) .arg(target.shortDescription())); k->setAutoDetected(false); - k->setAutoDetectionSource(m_envFile.toString()); + k->setAutoDetectionSource(m_envFile.toUrlishString()); k->setSticky(ToolchainKitAspect::id(), true); k->setSticky(RunDeviceTypeKitAspect::id(), true); @@ -655,8 +655,8 @@ void QnxSettingsWidget::updateInformation() config->ensureContents(); m_configName->setText(config->m_configName); m_configVersion->setText(config->m_version.toString()); - m_configHost->setText(config->m_qnxHost.toString()); - m_configTarget->setText(config->m_qnxTarget.toString()); + m_configHost->setText(config->m_qnxHost.toUrlishString()); + m_configTarget->setText(config->m_qnxTarget.toUrlishString()); m_compiler->setText(config->m_qccCompiler.toUserOutput()); m_architectures->setText(config->architectureNames()); m_kitCreation->setConfiguration(envFile); diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp index 8b9ffbba9d3..057c0c703e7 100644 --- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp @@ -142,7 +142,7 @@ private: symbolFile = Utils::findOrDefault(target->buildSystem()->applicationTargets(), [&](const BuildTargetInfo &ti) { return ti.buildKey == targetInformation.manifest.code - || ti.projectFilePath.toString() == targetInformation.manifest.code; + || ti.projectFilePath.toUrlishString() == targetInformation.manifest.code; }).targetFilePath; } else { reportFailure(Tr::tr("Cannot debug: Only QML and native applications are supported.")); diff --git a/src/plugins/qtapplicationmanager/appmanagerutilities.cpp b/src/plugins/qtapplicationmanager/appmanagerutilities.cpp index 42da4cd7a35..8d37282df77 100644 --- a/src/plugins/qtapplicationmanager/appmanagerutilities.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerutilities.cpp @@ -44,7 +44,7 @@ FilePath getToolFilePath(const QString &toolname, const Kit *kit, const IDevice: const FilePath path = local ? getToolPathByQtVersion(QtKitAspect::qtVersion(kit)) : FilePath(Constants::REMOTE_DEFAULT_BIN_PATH); const QString name = getToolNameByDevice(toolname, device); - const QString filePath = !path.isEmpty() ? path.pathAppended(name).toString() : name; + const QString filePath = !path.isEmpty() ? path.pathAppended(name).toUrlishString() : name; return !device ? FilePath::fromString(filePath) : device->filePath(filePath); } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 1bbf74f96ad..3543b8e8034 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1818,7 +1818,7 @@ FilePath QtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProString> OsType osInfo = mkspecFullPath.osType(); if (osInfo == OsTypeWindows) { if (!qt5) { - QFile f2(mkspecFullPath.toString() + "/qmake.conf"); + QFile f2(mkspecFullPath.toUrlishString() + "/qmake.conf"); if (f2.exists() && f2.open(QIODevice::ReadOnly)) { while (!f2.atEnd()) { QByteArray line = f2.readLine(); @@ -1830,7 +1830,7 @@ FilePath QtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProString> static const QRegularExpression rex("\\binclude\\(([^)]+)/qmake\\.conf\\)"); const QRegularExpressionMatch match = rex.match(QString::fromLocal8Bit(f2.readAll())); if (match.hasMatch()) { - possibleFullPath = mkspecFullPath.toString() + '/' + possibleFullPath = mkspecFullPath.toUrlishString() + '/' + match.captured(1); } } @@ -1847,7 +1847,7 @@ FilePath QtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProString> } } else { if (osInfo == OsTypeMac) { - QFile f2(mkspecFullPath.toString() + "/qmake.conf"); + QFile f2(mkspecFullPath.toUrlishString() + "/qmake.conf"); if (f2.exists() && f2.open(QIODevice::ReadOnly)) { while (!f2.atEnd()) { QByteArray line = f2.readLine(); @@ -1872,7 +1872,7 @@ FilePath QtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProString> QString rspec = mkspecFullPath.toFileInfo().symLinkTarget(); if (!rspec.isEmpty()) mkspecFullPath = FilePath::fromUserInput( - QDir(baseMkspecDir.toString()).absoluteFilePath(rspec)); + QDir(baseMkspecDir.toUrlishString()).absoluteFilePath(rspec)); } } return mkspecFullPath; @@ -2004,7 +2004,7 @@ bool QtVersion::isQtQuickCompilerSupported(QString *reason) const return false; } - const QString qtQuickCompilerPrf = mkspecsPath().toString() + "/features/qtquickcompiler.prf"; + const QString qtQuickCompilerPrf = mkspecsPath().toUrlishString() + "/features/qtquickcompiler.prf"; if (!QFileInfo::exists(qtQuickCompilerPrf)) { if (reason) *reason = Tr::tr("This Qt Version does not contain Qt Quick Compiler."); @@ -2075,7 +2075,7 @@ FilePaths QtVersionPrivate::qtCorePaths() static QByteArray scanQtBinaryForBuildString(const FilePath &library) { - QFile lib(library.toString()); + QFile lib(library.toUrlishString()); QByteArray buildString; if (lib.open(QIODevice::ReadOnly)) { diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 6d1bcd38404..ee62722f1e5 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -186,7 +186,7 @@ int ExampleSetModel::indexForQtVersion(QtVersion *qtVersion) const } // check for extra set - const QString &documentationPath = qtVersion->docsPath().toString(); + const QString &documentationPath = qtVersion->docsPath().toUrlishString(); for (int i = 0; i < rowCount(); ++i) { if (getType(i) == ExtraExampleSetType && m_extraExampleSets.at(getExtraExampleSetIndex(i)).manifestPath == documentationPath) @@ -253,7 +253,7 @@ int ExampleSetModel::getExtraExampleSetIndex(int i) const static QString resourcePath() { // normalize paths so QML doesn't freak out if it's wrongly capitalized on Windows - return Core::ICore::resourcePath().normalizedPathName().toString(); + return Core::ICore::resourcePath().normalizedPathName().toUrlishString(); } static QPixmap fetchPixmapAndUpdatePixmapCache(const QString &url) @@ -576,9 +576,9 @@ QStringList ExampleSetModel::exampleSources(QString *examplesInstallPath, const QtVersions versions = QtVersionManager::versions(); for (QtVersion *version : versions) { if (version->uniqueId() == qtId) { - manifestScanPath = version->docsPath().toString(); - examplesPath = version->examplesPath().toString(); - demosPath = version->demosPath().toString(); + manifestScanPath = version->docsPath().toUrlishString(); + examplesPath = version->examplesPath().toUrlishString(); + demosPath = version->demosPath().toUrlishString(); if (qtVersion) *qtVersion = version->qtVersion(); break; diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp index ed381e55ff6..c36b436730a 100644 --- a/src/plugins/qtsupport/externaleditors.cpp +++ b/src/plugins/qtsupport/externaleditors.cpp @@ -122,7 +122,7 @@ static QString locateBinary(const QString &path, const QString &binary) static QString designerBinary(const QtSupport::QtVersion *qtVersion) { if (qtVersion) - return qtVersion->designerFilePath().toString(); + return qtVersion->designerFilePath().toUrlishString(); return QLatin1String(HostOsInfo::isMacHost() ? "Designer" : "designer"); } @@ -210,7 +210,7 @@ static bool getEditorLaunchData(const CommandForQtVersion &commandForQtVersion, } // Setup binary + arguments, use Mac Open if appropriate - data->arguments.push_back(filePath.toString()); + data->arguments.push_back(filePath.toUrlishString()); if (HostOsInfo::isMacHost()) *data = createMacOpenCommand(*data); if (debug) @@ -281,7 +281,7 @@ public: if (debug) qDebug() << Q_FUNC_INFO << "\nWriting to socket:" << data.binary << filePath; QTcpSocket *socket = it.value(); - if (!socket->write(filePath.toString().toUtf8() + '\n')) { + if (!socket->write(filePath.toUrlishString().toUtf8() + '\n')) { *errorMessage = Tr::tr("Qt Widgets Designer is not responding (%1).") .arg(socket->errorString()); return false; @@ -329,7 +329,7 @@ void setupExternalDesigner(QObject *guard) static QString linguistBinary(const QtSupport::QtVersion *qtVersion) { if (qtVersion) - return qtVersion->linguistFilePath().toString(); + return qtVersion->linguistFilePath().toUrlishString(); return QLatin1String(HostOsInfo::isMacHost() ? "Linguist" : "linguist"); } diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index cf5a0c68ab3..6690f0d610b 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -34,9 +34,9 @@ public: , m_tmpdir("qscxmlgenerator") { QTC_ASSERT(targets.count() == 2, return); - m_header = m_tmpdir.filePath(targets[0].fileName()).toString(); + m_header = m_tmpdir.filePath(targets[0].fileName()).toUrlishString(); QTC_ASSERT(!m_header.isEmpty(), return); - m_impl = m_tmpdir.filePath(targets[1].fileName()).toString(); + m_impl = m_tmpdir.filePath(targets[1].fileName()).toUrlishString(); } private: @@ -101,7 +101,7 @@ FilePath QScxmlcGenerator::command() const bool QScxmlcGenerator::prepareToRun(const QByteArray &sourceContents) { const FilePath fn = tmpFile(); - QFile input(fn.toString()); + QFile input(fn.toUrlishString()); if (!input.open(QIODevice::WriteOnly)) return false; input.write(sourceContents); @@ -117,7 +117,7 @@ FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(Process *process) FileNameToContentsHash result; forEachTarget([&](const FilePath &target) { const FilePath file = wd.pathAppended(target.fileName()); - QFile generated(file.toString()); + QFile generated(file.toUrlishString()); if (!generated.open(QIODevice::ReadOnly)) return; result[target] = generated.readAll(); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index df01eb76f17..2eaa722681a 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -881,7 +881,7 @@ static QString qtVersionsFile(const QString &baseDir) static std::optional<FilePath> currentlyLinkedQtDir(bool *hasInstallSettings) { - const QString installSettingsFilePath = settingsFile(ICore::resourcePath().toString()); + const QString installSettingsFilePath = settingsFile(ICore::resourcePath().toUrlishString()); const bool installSettingsExist = QFileInfo::exists(installSettingsFilePath); if (hasInstallSettings) *hasInstallSettings = installSettingsExist; @@ -994,8 +994,8 @@ static std::optional<FilePath> settingsDirForQtDir(const FilePath &baseDirectory return qtDir / dir; }); const FilePath validDir = Utils::findOrDefault(dirsToCheck, [baseDirectory](const FilePath &dir) { - return QFileInfo::exists(settingsFile(baseDirectory.resolvePath(dir).toString())) - || QFileInfo::exists(qtVersionsFile(baseDirectory.resolvePath(dir).toString())); + return QFileInfo::exists(settingsFile(baseDirectory.resolvePath(dir).toUrlishString())) + || QFileInfo::exists(qtVersionsFile(baseDirectory.resolvePath(dir).toUrlishString())); }); if (!validDir.isEmpty()) return validDir; @@ -1076,7 +1076,7 @@ void QtSettingsPageWidget::linkWithQt() unlinkButton->setEnabled(currentLink.has_value()); connect(unlinkButton, &QPushButton::clicked, &dialog, [&dialog, &askForRestart] { bool removeSettingsFile = false; - const QString filePath = settingsFile(ICore::resourcePath().toString()); + const QString filePath = settingsFile(ICore::resourcePath().toUrlishString()); { QSettings installSettings(filePath, QSettings::IniFormat); installSettings.remove(kInstallSettingsKey); @@ -1097,7 +1097,7 @@ void QtSettingsPageWidget::linkWithQt() const std::optional<FilePath> settingsDir = settingsDirForQtDir(pathInput->baseDirectory(), pathInput->unexpandedFilePath()); if (QTC_GUARD(settingsDir)) { - const QString settingsFilePath = settingsFile(ICore::resourcePath().toString()); + const QString settingsFilePath = settingsFile(ICore::resourcePath().toUrlishString()); QSettings settings(settingsFilePath, QSettings::IniFormat); settings.setValue(kInstallSettingsKey, settingsDir->toVariant()); settings.sync(); diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 13b6d543131..53da96d36a7 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -253,7 +253,7 @@ public: void openEditor(const FilePath &filePath, int line, int column = -1) override { - this->fileName = filePath.toString(); + this->fileName = filePath.toUrlishString(); this->line = line; this->column = column; } diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index c2210da5e9b..613f636484d 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -247,7 +247,7 @@ static QStringList additionalFilesToCopy(const QtVersion *qt) const int major = qt->qtVersion().majorVersion(); if (major >= 6) { if (HostOsInfo::isMacHost()) { - return {qt->libraryPath().pathAppended("/QtCore.framework/Versions/A/QtCore").toString()}; + return {qt->libraryPath().pathAppended("/QtCore.framework/Versions/A/QtCore").toUrlishString()}; } else if (HostOsInfo::isWindowsHost()) { const QString release = QString("bin/Qt%1Core.dll").arg(major); const QString debug = QString("bin/Qt%1Cored.dll").arg(major); @@ -257,14 +257,14 @@ static QStringList additionalFilesToCopy(const QtVersion *qt) const FilePath base = qt->qmakeFilePath().parentDir().parentDir(); const QStringList allFiles = Utils::transform( {release, debug, mingwGcc, mingwStd, mingwPthread}, [&base](const QString &s) { - return base.pathAppended(s).toString(); + return base.pathAppended(s).toUrlishString(); }); const QStringList existingFiles = Utils::filtered(allFiles, [](const QString &f) { return FilePath::fromUserInput(f).exists(); }); return !existingFiles.empty() ? existingFiles : QStringList(release); } else if (HostOsInfo::isLinuxHost()) { - const QDir base(qt->libraryPath().toString()); + const QDir base(qt->libraryPath().toUrlishString()); const QString core = base.absolutePath() + QString("/libQt%1Core.so.%1").arg(major); const QStringList icuLibs = Utils::transform(base.entryInfoList({"libicu*.so.*"}), [](const QFileInfo &fi) { @@ -288,12 +288,12 @@ static Utils::FilePath setupQmake(const QtVersion *qt, const QString &path) return fp.path(); }; - const QStringList filesToCopy = QStringList(qmake.toString()) + additionalFilesToCopy(qt); + const QStringList filesToCopy = QStringList(qmake.toUrlishString()) + additionalFilesToCopy(qt); for (const QString &file : filesToCopy) { const FilePath sourceFile = FilePath::fromString(file); const FilePath targetFile = target.pathAppended(removeDriveLetter(sourceFile)); if (!targetFile.parentDir().ensureWritableDir() || !sourceFile.copyFile(targetFile)) { - qDebug() << "Failed to copy" << sourceFile.toString() << "to" << targetFile.toString(); + qDebug() << "Failed to copy" << sourceFile.toUrlishString() << "to" << targetFile.toUrlishString(); return {}; } } diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp index 309d3f021df..9395c87e1a9 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -60,7 +60,7 @@ public: QString host; if (kit) { - systemRoot = SysRootKitAspect::sysRoot(kit).toString(); + systemRoot = SysRootKitAspect::sysRoot(kit).toUrlishString(); const IDevice::ConstPtr deviceConfiguration = RunDeviceKitAspect::device(kit); host = deviceConfiguration->sshParameters().host(); } @@ -116,7 +116,7 @@ Store DeploymentTimeInfo::exportDeployTimes() const using DepIt = QHash<DeployParameters, DeploymentTimeInfoPrivate::Timestamps>::ConstIterator; for (DepIt it = d->lastDeployed.constBegin(); it != d->lastDeployed.constEnd(); ++it) { - fileList << it.key().file.localFilePath().toString(); + fileList << it.key().file.localFilePath().toUrlishString(); remotePathList << it.key().file.remoteDirectory(); hostList << it.key().host; sysrootList << it.key().sysroot; diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 1a2519a3af8..bee7ba2930e 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -183,7 +183,7 @@ bool MakeInstallStep::init() const auto buildStep = buildConfiguration()->buildSteps()->firstOfType<AbstractProcessStep>(); m_isCmakeProject = buildStep - && buildStep->processParameters()->command().executable().toString() + && buildStep->processParameters()->command().executable().toUrlishString() .contains("cmake"); return true; diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index f7801b3b964..e8e341cc43b 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -82,7 +82,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog( const QString hostKeyCheckingString = params.hostKeyCheckingMode == SshHostKeyCheckingStrict ? QLatin1String("yes") : QLatin1String("no"); const bool isWindows = HostOsInfo::isWindowsHost() - && SshSettings::sshFilePath().toString().toLower().contains("/system32/"); + && SshSettings::sshFilePath().toUrlishString().toLower().contains("/system32/"); const bool useTimeout = (params.timeout != 0) && !isWindows; Utils::CommandLine cmd{SshSettings::sshFilePath()}; diff --git a/src/plugins/remotelinux/sshdevicewizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp index b1f41777fca..69d1e1f11ef 100644 --- a/src/plugins/remotelinux/sshdevicewizard.cpp +++ b/src/plugins/remotelinux/sshdevicewizard.cpp @@ -155,7 +155,7 @@ private: m_iconLabel.clear(); } bool isComplete() const final { - return m_keyFileChooser.filePath().toString().isEmpty() + return m_keyFileChooser.filePath().toUrlishString().isEmpty() || m_keyFileChooser.filePath().exists(); } bool validatePage() final { diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index 303175ab849..c1552b1d75f 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -241,7 +241,7 @@ void TarPackageCreationStep::addNeededDeploymentFiles( return; } - const QStringList files = QDir(deployable.localFilePath().toString()) + const QStringList files = QDir(deployable.localFilePath().toUrlishString()) .entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); if (files.isEmpty()) { diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index 9b6c78a92eb..83b1122abe1 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -105,7 +105,7 @@ Core::IDocument::OpenResult ResourceFile::load() if (m_contents.isEmpty()) { // Regular file - QFile file(m_filePath.toString()); + QFile file(m_filePath.toUrlishString()); if (!file.open(QIODevice::ReadOnly)) { m_error_message = file.errorString(); return Core::IDocument::OpenResult::ReadError; @@ -815,7 +815,7 @@ bool ResourceModel::setData(const QModelIndex &index, const QVariant &value, int if (!newFileName.isChildOf(filePath().absolutePath())) return false; - return renameFile(file(index), newFileName.toString()); + return renameFile(file(index), newFileName.toUrlishString()); } void ResourceModel::getItem(const QModelIndex &index, QString &prefix, QString &file) const diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 587b5d07f0f..ab2b7b273bf 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -131,11 +131,11 @@ static bool addFilesToResource(const FilePath &resourceFile, if (notAdded) notAdded->clear(); for (const FilePath &path : filePaths) { - if (file.contains(index, path.toString())) { + if (file.contains(index, path.toUrlishString())) { if (notAdded) *notAdded << path; } else { - file.addFile(index, path.toString()); + file.addFile(index, path.toUrlishString()); } } @@ -521,7 +521,7 @@ bool ResourceFolderNode::canRenameFile(const FilePath &oldFilePath, const FilePa int index = (file.load() != IDocument::OpenResult::Success) ? -1 :file.indexOfPrefix(m_prefix, m_lang); if (index != -1) { for (int j = 0; j < file.fileCount(index); ++j) { - if (file.file(index, j) == oldFilePath.toString()) { + if (file.file(index, j) == oldFilePath.toUrlishString()) { fileEntryExists = true; break; } @@ -544,8 +544,8 @@ bool ResourceFolderNode::renameFiles(const FilePairs &filesToRename, FilePaths * for (const auto &[oldFilePath, newFilePath] : filesToRename) { bool found = false; for (int j = 0; j < file.fileCount(index); ++j) { - if (file.file(index, j) == oldFilePath.toString()) { - file.replaceFile(index, j, newFilePath.toString()); + if (file.file(index, j) == oldFilePath.toUrlishString()) { + file.replaceFile(index, j, newFilePath.toUrlishString()); found = true; break; } diff --git a/src/plugins/screenrecorder/cropandtrim.cpp b/src/plugins/screenrecorder/cropandtrim.cpp index 07e6da99e2d..690757b4f1a 100644 --- a/src/plugins/screenrecorder/cropandtrim.cpp +++ b/src/plugins/screenrecorder/cropandtrim.cpp @@ -346,7 +346,7 @@ CropWidget::CropWidget(QWidget *parent) lastDir.setValue(file.parentDir()); lastDir.writeToSettingsImmediatly(); const QImage image = m_cropScene->croppedImage(); - image.save(file.toString()); + image.save(file.toUrlishString()); } }); connect(copyImageToClipboardAction, &QAction::triggered, this, [this] { diff --git a/src/plugins/screenrecorder/export.cpp b/src/plugins/screenrecorder/export.cpp index de845fd1cdc..07c4801cdf7 100644 --- a/src/plugins/screenrecorder/export.cpp +++ b/src/plugins/screenrecorder/export.cpp @@ -268,12 +268,12 @@ QStringList ExportWidget::ffmpegExportParameters() const "-v", "error", "-stats", "-stats_period", "0.25", - "-i", m_inputClipInfo.file.toString(), + "-i", m_inputClipInfo.file.toUrlishString(), } << "-filter_complex" << trimFilter + cropFilter + extraFilter << "-map" << "[out]" << m_currentFormat.encodingParameters << loop - << m_outputClipInfo.file.toString(); + << m_outputClipInfo.file.toUrlishString(); return args; } diff --git a/src/plugins/screenrecorder/record.cpp b/src/plugins/screenrecorder/record.cpp index cc0cbd00fd5..f54ed6f3642 100644 --- a/src/plugins/screenrecorder/record.cpp +++ b/src/plugins/screenrecorder/record.cpp @@ -416,7 +416,7 @@ QStringList RecordWidget::ffmpegParameters(const ClipInfo &clipInfo) const if (Internal::settings().enableRtBuffer()) args.append({"-rtbufsize", QString::number(Internal::settings().rtBufferSize()) + "M"}); args.append(recordPreset().encodingParameters); - args.append(clipInfo.file.toString()); + args.append(clipInfo.file.toUrlishString()); return args; } diff --git a/src/plugins/screenrecorder/screenrecordersettings.cpp b/src/plugins/screenrecorder/screenrecordersettings.cpp index 94436646367..72c86934133 100644 --- a/src/plugins/screenrecorder/screenrecordersettings.cpp +++ b/src/plugins/screenrecorder/screenrecordersettings.cpp @@ -135,18 +135,18 @@ ScreenRecorderSettings::ScreenRecorderSettings() lastOpenDirectory.setSettingsKey("LastOpenDir"); lastOpenDirectory.setExpectedKind(PathChooser::ExistingDirectory); - lastOpenDirectory.setDefaultValue(FileUtils::homePath().toString()); + lastOpenDirectory.setDefaultValue(FileUtils::homePath().toUrlishString()); exportLastDirectory.setSettingsKey("ExportLastDir"); exportLastDirectory.setExpectedKind(PathChooser::ExistingDirectory); - exportLastDirectory.setDefaultValue(FileUtils::homePath().toString()); + exportLastDirectory.setDefaultValue(FileUtils::homePath().toUrlishString()); exportLastFormat.setSettingsKey("ExportLastFormat"); exportLastFormat.setDefaultValue("WebP"); lastSaveImageDirectory.setSettingsKey("LastSaveImageDir"); lastSaveImageDirectory.setExpectedKind(PathChooser::ExistingDirectory); - lastSaveImageDirectory.setDefaultValue(FileUtils::homePath().toString()); + lastSaveImageDirectory.setDefaultValue(FileUtils::homePath().toUrlishString()); recordFrameRate.setSettingsKey("RecordFrameRate"); recordFrameRate.setDefaultValue(24); diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp index 35909cc2bd6..6517d5b012b 100644 --- a/src/plugins/scxmleditor/common/mainwidget.cpp +++ b/src/plugins/scxmleditor/common/mainwidget.cpp @@ -432,8 +432,8 @@ void MainWidget::exportToImage() QPainter painter(&image); view->scene()->render(&painter, QRectF(), r); - if (image.save(filePath.toString())) { - s->setValue(Constants::C_SETTINGS_LASTEXPORTFOLDER, filePath.parentDir().toString()); + if (image.save(filePath.toUrlishString())) { + s->setValue(Constants::C_SETTINGS_LASTEXPORTFOLDER, filePath.parentDir().toUrlishString()); } else { QMessageBox::warning(this, Tr::tr("Export Failed"), Tr::tr("Could not export to image.")); } @@ -456,7 +456,7 @@ void MainWidget::saveScreenShot() if (!filePath.isEmpty()) { const QImage image = view->view()->grabView(); - if (image.save(filePath.toString())) { + if (image.save(filePath.toUrlishString())) { s->setValue(Constants::C_SETTINGS_LASTSAVESCREENSHOTFOLDER, filePath.parentDir().toSettings()); } else { QMessageBox::warning(this, Tr::tr("Saving Failed"), Tr::tr("Could not save the screenshot.")); diff --git a/src/plugins/scxmleditor/outputpane/errorwidget.cpp b/src/plugins/scxmleditor/outputpane/errorwidget.cpp index 2bbd158a97a..1a7b295b061 100644 --- a/src/plugins/scxmleditor/outputpane/errorwidget.cpp +++ b/src/plugins/scxmleditor/outputpane/errorwidget.cpp @@ -190,7 +190,7 @@ void ErrorWidget::exportWarnings() if (fileName.isEmpty()) return; - QFile file(fileName.toString()); + QFile file(fileName.toUrlishString()); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { QMessageBox::warning(this, Tr::tr("Export Failed"), Tr::tr("Cannot open file %1.").arg(fileName.toUserOutput())); file.close(); diff --git a/src/plugins/scxmleditor/scxmleditordocument.cpp b/src/plugins/scxmleditor/scxmleditordocument.cpp index 8d8fa25e0d3..81cebd280ac 100644 --- a/src/plugins/scxmleditor/scxmleditordocument.cpp +++ b/src/plugins/scxmleditor/scxmleditordocument.cpp @@ -47,7 +47,7 @@ Core::IDocument::OpenResult ScxmlEditorDocument::open(QString *errorString, return OpenResult::ReadError; const FilePath &absoluteFilePath = filePath.absoluteFilePath(); - if (!m_designWidget->load(absoluteFilePath.toString())) { + if (!m_designWidget->load(absoluteFilePath.toUrlishString())) { *errorString = m_designWidget->errorMessage(); return OpenResult::ReadError; } @@ -64,14 +64,14 @@ Result ScxmlEditorDocument::saveImpl(const FilePath &filePath, bool autoSave) bool dirty = m_designWidget->isDirty(); - m_designWidget->setFileName(filePath.toString()); + m_designWidget->setFileName(filePath.toUrlishString()); if (!m_designWidget->save()) { - m_designWidget->setFileName(this->filePath().toString()); + m_designWidget->setFileName(this->filePath().toUrlishString()); return Result::Error(m_designWidget->errorMessage()); } if (autoSave) { - m_designWidget->setFileName(this->filePath().toString()); + m_designWidget->setFileName(this->filePath().toUrlishString()); m_designWidget->save(); return Result::Ok; } @@ -86,7 +86,7 @@ Result ScxmlEditorDocument::saveImpl(const FilePath &filePath, bool autoSave) void ScxmlEditorDocument::setFilePath(const FilePath &newName) { - m_designWidget->setFileName(newName.toString()); + m_designWidget->setFileName(newName.toUrlishString()); IDocument::setFilePath(newName); } @@ -117,7 +117,7 @@ Result ScxmlEditorDocument::reload(ReloadFlag flag, ChangeType type) return Result::Ok; emit aboutToReload(); QString errorString; - emit reloadRequested(&errorString, filePath().toString()); + emit reloadRequested(&errorString, filePath().toUrlishString()); const bool success = errorString.isEmpty(); emit reloadFinished(success); return Result(success, errorString); diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index 57a2683428c..170177723c6 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -86,7 +86,7 @@ static void runSilverSeacher(QPromise<SearchResultItems> &promise, if (!searchOptions.isEmpty()) arguments << searchOptions.split(' '); - arguments << "--" << parameters.text << parameters.searchDir.normalizedPathName().toString(); + arguments << "--" << parameters.text << parameters.searchDir.normalizedPathName().toUrlishString(); process.setCommand({"ag", arguments}); }; diff --git a/src/plugins/squish/squishfilehandler.cpp b/src/plugins/squish/squishfilehandler.cpp index 975f3646f6a..1ce86e1e88e 100644 --- a/src/plugins/squish/squishfilehandler.cpp +++ b/src/plugins/squish/squishfilehandler.cpp @@ -232,7 +232,7 @@ void SquishFileHandler::openTestSuites() const Utils::FilePaths chosenSuites = dialog.chosenSuites(); for (const Utils::FilePath &suiteDir : chosenSuites) { const QString suiteName = suiteDir.fileName(); - const QStringList cases = SuiteConf::validTestCases(suiteDir.toString()); + const QStringList cases = SuiteConf::validTestCases(suiteDir.toUrlishString()); const Utils::FilePath suiteConf = suiteDir.pathAppended("suite.conf"); if (m_suites.contains(suiteName)) { @@ -268,7 +268,7 @@ void SquishFileHandler::openTestSuites() void SquishFileHandler::openTestSuite(const Utils::FilePath &suiteConfPath, bool isReopen) { const QString suiteName = suiteConfPath.parentDir().fileName(); - const QStringList cases = SuiteConf::validTestCases(suiteConfPath.parentDir().toString()); + const QStringList cases = SuiteConf::validTestCases(suiteConfPath.parentDir().toUrlishString()); if (m_suites.contains(suiteName)) { if (isReopen) { @@ -565,7 +565,7 @@ void SquishFileHandler::updateSquishServerGlobalScripts() QStringList SquishFileHandler::suitePathsAsStringList() const { - return Utils::transform(m_suites.values(), &Utils::FilePath::toString); + return Utils::transform(m_suites.values(), &Utils::FilePath::toUrlishString); } } // namespace Internal diff --git a/src/plugins/squish/squishrunnerprocess.cpp b/src/plugins/squish/squishrunnerprocess.cpp index fbbf7a57b3a..cb4431b2327 100644 --- a/src/plugins/squish/squishrunnerprocess.cpp +++ b/src/plugins/squish/squishrunnerprocess.cpp @@ -140,7 +140,7 @@ void SquishRunnerProcess::onStdOutput(const QString &lineIn) fileName.chop(1); // remove the colon const Utils::FilePath fp = Utils::FilePath::fromUserInput(fileName); if (fp.isRelativePath()) - fileName = m_currentTestCasePath.resolvePath(fileName).toString(); + fileName = m_currentTestCasePath.resolvePath(fileName).toUrlishString(); } else if (m_autId == 0 && line.startsWith("AUTID: ")) { isPrompt = true; m_autId = line.mid(7).toInt(); diff --git a/src/plugins/squish/squishsettings.cpp b/src/plugins/squish/squishsettings.cpp index 7aac82bde54..677eb792816 100644 --- a/src/plugins/squish/squishsettings.cpp +++ b/src/plugins/squish/squishsettings.cpp @@ -506,7 +506,7 @@ void SquishServerSettingsWidget::addAutPath(TreeItem *categoryItem, SquishServer const FilePath path = FileUtils::getExistingDirectory(Tr::tr("Select Application Path"), entry); if (path.isEmpty() || path == entry) return; - const QString pathStr = path.toString(); + const QString pathStr = path.toUrlishString(); if (original) { m_serverSettings.autPaths.removeOne(originalPathStr); m_model.destroyItem(original); diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp index 98430e5db4a..1582e963b83 100644 --- a/src/plugins/squish/squishtools.cpp +++ b/src/plugins/squish/squishtools.cpp @@ -529,7 +529,7 @@ void SquishTools::startSquishServer(Request request) toolsSettings.setup(); const FilePath squishServer = Environment::systemEnvironment().searchInPath( - toolsSettings.serverPath.toString()); + toolsSettings.serverPath.toUrlishString()); if (!squishServer.isExecutableFile()) { const QString detail = Tr::tr("\"%1\" could not be found or is not executable.\nCheck the " "settings.").arg(toolsSettings.serverPath.toUserOutput()); @@ -1189,7 +1189,7 @@ QStringList SquishTools::runnerArgumentsFromSettings() if (m_request == RecordTestRequested) { arguments << "--startapp"; // --record is triggered separately } else if (m_request == RunTestRequested) { - arguments << "--testcase" << m_currentTestCasePath.toString(); + arguments << "--testcase" << m_currentTestCasePath.toUrlishString(); arguments << "--debug" << "--ide"; } else { QTC_ASSERT(false, qDebug("Request %d", m_request)); @@ -1213,7 +1213,7 @@ QStringList SquishTools::runnerArgumentsFromSettings() arguments << "--reportgen" << QString::fromLatin1("xml2.2,%1").arg(caseReportFilePath.toUserOutput()); - m_currentResultsXML = new QFile(caseReportFilePath.toString()); + m_currentResultsXML = new QFile(caseReportFilePath.toUrlishString()); } return arguments; } @@ -1249,7 +1249,7 @@ bool SquishTools::isValidToStartRunner() bool SquishTools::setupRunnerPath() { const FilePath squishRunner = Environment::systemEnvironment().searchInPath( - toolsSettings.runnerPath.toString()); + toolsSettings.runnerPath.toUrlishString()); if (!squishRunner.isExecutableFile()) { const QString detail = Tr::tr("\"%1\" could not be found or is not executable.\nCheck the " "settings.").arg(toolsSettings.runnerPath.toUserOutput()); @@ -1274,9 +1274,9 @@ void SquishTools::setupAndStartSquishRunnerProcess(const CommandLine &cmdLine) m_resultsFileWatcher = new QFileSystemWatcher; // on 2nd run this directory exists and won't emit changes, so use the current subdirectory if (m_currentResultsDirectory.exists()) - m_resultsFileWatcher->addPath(m_currentResultsDirectory.pathAppended(m_suitePath.fileName()).toString()); + m_resultsFileWatcher->addPath(m_currentResultsDirectory.pathAppended(m_suitePath.fileName()).toUrlishString()); else - m_resultsFileWatcher->addPath(m_currentResultsDirectory.toString()); + m_resultsFileWatcher->addPath(m_currentResultsDirectory.toUrlishString()); connect(m_resultsFileWatcher, &QFileSystemWatcher::directoryChanged, diff --git a/src/plugins/squish/squishxmloutputhandler.cpp b/src/plugins/squish/squishxmloutputhandler.cpp index d41e4bccc8d..7a6c92beb91 100644 --- a/src/plugins/squish/squishxmloutputhandler.cpp +++ b/src/plugins/squish/squishxmloutputhandler.cpp @@ -38,7 +38,7 @@ void SquishXmlOutputHandler::mergeResultFiles(const Utils::FilePaths &reportFile const QString &suiteName, QString *error) { - QFile resultsXML(resultsDirectory.pathAppended("results.xml").toString()); + QFile resultsXML(resultsDirectory.pathAppended("results.xml").toUrlishString()); if (resultsXML.exists()) { if (error) *error = Tr::tr("Could not merge results into single results.xml.\n" @@ -61,7 +61,7 @@ void SquishXmlOutputHandler::mergeResultFiles(const Utils::FilePaths &reportFile bool isFirstTest = true; QString lastEpilogTime; for (const Utils::FilePath &caseResult : reportFiles) { - QFile currentResultsFile(caseResult.toString()); + QFile currentResultsFile(caseResult.toUrlishString()); if (!currentResultsFile.exists()) continue; if (!currentResultsFile.open(QFile::ReadOnly)) diff --git a/src/plugins/squish/suiteconf.cpp b/src/plugins/squish/suiteconf.cpp index 9e6ebfdea5c..0f63f241d0c 100644 --- a/src/plugins/squish/suiteconf.cpp +++ b/src/plugins/squish/suiteconf.cpp @@ -282,7 +282,7 @@ QStringList SuiteConf::validTestCases(const QString &baseDirectory) const Utils::FilePath testCaseDir = subDir / testCase; if (testCaseDir.isDir()) { Utils::FilePath testCaseTest = testCaseDir.pathAppended("test" + extension); - validCases.append(testCaseTest.toString()); + validCases.append(testCaseTest.toUrlishString()); } } @@ -291,7 +291,7 @@ QStringList SuiteConf::validTestCases(const QString &baseDirectory) for (const Utils::FilePath &entry : entries) { if (!entry.fileName().startsWith("tst_")) continue; - const QString testFileStr = entry.pathAppended("test" + extension).toString(); + const QString testFileStr = entry.pathAppended("test" + extension).toUrlishString(); if (!validCases.contains(testFileStr)) validCases.append(testFileStr); } diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp index 6f4487e5f86..46333d1a374 100644 --- a/src/plugins/studiowelcome/examplecheckout.cpp +++ b/src/plugins/studiowelcome/examplecheckout.cpp @@ -183,7 +183,7 @@ bool DataModelDownloader::available() const FilePath DataModelDownloader::targetFolder() const { - return FilePath::fromUserInput(tempFilePath().toString() + "/" + "dataImports"); + return FilePath::fromUserInput(tempFilePath().toUrlishString() + "/" + "dataImports"); } void DataModelDownloader::setForceDownload(bool b) diff --git a/src/plugins/studiowelcome/newprojectdialogimageprovider.cpp b/src/plugins/studiowelcome/newprojectdialogimageprovider.cpp index 710db977ead..874d9107438 100644 --- a/src/plugins/studiowelcome/newprojectdialogimageprovider.cpp +++ b/src/plugins/studiowelcome/newprojectdialogimageprovider.cpp @@ -17,7 +17,7 @@ NewProjectDialogImageProvider::NewProjectDialogImageProvider() QPixmap NewProjectDialogImageProvider::invalidStyleIcon() { - QString iconPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/style-error.png").toString(); + QString iconPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/style-error.png").toUrlishString(); QString file = Utils::StyleHelper::dpiSpecificImageFile(iconPath); return QPixmap{file}; } @@ -44,7 +44,7 @@ QPixmap NewProjectDialogImageProvider::requestStatusPixmap(const QString &id, QS QPixmap NewProjectDialogImageProvider::requestStylePixmap(const QString &id, QSize *size, const QSize &requestedSize) { - QString realPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/" + id).toString(); + QString realPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/" + id).toUrlishString(); QPixmap pixmap{realPath}; @@ -64,7 +64,7 @@ QPixmap NewProjectDialogImageProvider::requestStylePixmap(const QString &id, QSi QPixmap NewProjectDialogImageProvider::requestDefaultPixmap(const QString &id, QSize *size, const QSize &requestedSize) { - QString realPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/" + id).toString(); + QString realPath = Core::ICore::resourcePath("qmldesigner/newprojectdialog/image/" + id).toUrlishString(); QPixmap pixmap{realPath}; diff --git a/src/plugins/studiowelcome/qdsnewdialog.cpp b/src/plugins/studiowelcome/qdsnewdialog.cpp index e4e81699bb4..ba16f5dd9c9 100644 --- a/src/plugins/studiowelcome/qdsnewdialog.cpp +++ b/src/plugins/studiowelcome/qdsnewdialog.cpp @@ -68,8 +68,8 @@ QdsNewDialog::QdsNewDialog(QWidget *parent) new Internal::NewProjectDialogImageProvider()); QmlDesigner::Theme::setupTheme(m_dialog->engine()); qmlRegisterSingletonInstance<QdsNewDialog>("BackendApi", 1, 0, "BackendApi", this); - m_dialog->engine()->addImportPath(Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources/imports").toString()); - m_dialog->engine()->addImportPath(Core::ICore::resourcePath("qmldesigner/newprojectdialog/imports").toString()); + m_dialog->engine()->addImportPath(Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources/imports").toUrlishString()); + m_dialog->engine()->addImportPath(Core::ICore::resourcePath("qmldesigner/newprojectdialog/imports").toUrlishString()); m_dialog->setSource(QUrl::fromLocalFile(qmlPath())); m_dialog->setWindowModality(Qt::ApplicationModal); @@ -230,7 +230,7 @@ void QdsNewDialog::onWizardCreated(QStandardItemModel *screenSizeModel, QStandar updateScreenSizes(); setProjectName(m_qmlProjectName); - setProjectLocation(m_qmlProjectLocation.toString()); + setProjectLocation(m_qmlProjectLocation.toUrlishString()); } } @@ -323,10 +323,10 @@ void QdsNewDialog::setWizardFactories(QList<Core::IWizardFactory *> factories_, const Core::IWizardFactory *first = factories.front(); Utils::FilePath projectLocation = first->runPath(defaultLocation); - m_qmlProjectName = uniqueProjectName(projectLocation.toString()); + m_qmlProjectName = uniqueProjectName(projectLocation.toUrlishString()); emit projectNameChanged(); // So that QML knows to update the field - m_qmlProjectLocation = Utils::FilePath::fromString(QDir::toNativeSeparators(projectLocation.toString())); + m_qmlProjectLocation = Utils::FilePath::fromString(QDir::toNativeSeparators(projectLocation.toUrlishString())); emit projectLocationChanged(); // So that QML knows to update the field /* NOTE: @@ -357,7 +357,7 @@ QString QdsNewDialog::recentsTabName() const QString QdsNewDialog::qmlPath() const { - return Core::ICore::resourcePath("qmldesigner/newprojectdialog/NewProjectDialog.qml").toString(); + return Core::ICore::resourcePath("qmldesigner/newprojectdialog/NewProjectDialog.qml").toUrlishString(); } void QdsNewDialog::showDialog() @@ -416,7 +416,7 @@ QString QdsNewDialog::chooseProjectLocation() Utils::FilePath newPath = Utils::FileUtils::getExistingDirectory(tr("Choose Directory"), m_qmlProjectLocation); - return QDir::toNativeSeparators(newPath.toString()); + return QDir::toNativeSeparators(newPath.toUrlishString()); } void QdsNewDialog::setSelectedPreset(int selection) diff --git a/src/plugins/studiowelcome/qdsnewdialog.h b/src/plugins/studiowelcome/qdsnewdialog.h index 2444028d5fd..fece648105c 100644 --- a/src/plugins/studiowelcome/qdsnewdialog.h +++ b/src/plugins/studiowelcome/qdsnewdialog.h @@ -133,7 +133,7 @@ private: void setProjectName(const QString &name); void setProjectLocation(const QString &location); - QString projectLocation() const { return m_qmlProjectLocation.toString(); } + QString projectLocation() const { return m_qmlProjectLocation.toUrlishString(); } void setProjectDescription(const QString &description) { diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index a8558d3eef3..95207478ffe 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -750,7 +750,7 @@ WelcomeMode::WelcomeMode() { setDisplayName(tr("Welcome")); - const QString welcomePagePath = Core::ICore::resourcePath("qmldesigner/welcomepage").toString(); + const QString welcomePagePath = Core::ICore::resourcePath("qmldesigner/welcomepage").toUrlishString(); m_dataModelDownloader = new DataModelDownloader(this); if (!m_dataModelDownloader->exists()) { //Fallback if data cannot be downloaded @@ -760,7 +760,7 @@ WelcomeMode::WelcomeMode() m_dataModelDownloader->setForceDownload(true); } - Utils::FilePath readme = Utils::FilePath::fromUserInput(m_dataModelDownloader->targetFolder().toString() + Utils::FilePath readme = Utils::FilePath::fromUserInput(m_dataModelDownloader->targetFolder().toUrlishString() + "/readme.txt"); @@ -837,10 +837,10 @@ void WelcomeMode::setupQuickWidget(const QString &welcomePagePath) ->setContextProperty("isFirstUsage", QVariant::fromValue(isFirstUsage())); m_quickWidget->engine()->addImportPath( - Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources/imports").toString()); + Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources/imports").toUrlishString()); m_quickWidget->engine()->addImportPath(welcomePagePath + "/imports"); - m_quickWidget->engine()->addImportPath(m_dataModelDownloader->targetFolder().toString()); + m_quickWidget->engine()->addImportPath(m_dataModelDownloader->targetFolder().toUrlishString()); m_quickWidget->setSource(QUrl::fromLocalFile(welcomePagePath + "/main.qml")); QShortcut *updateShortcut = nullptr; diff --git a/src/plugins/studiowelcome/userpresets.cpp b/src/plugins/studiowelcome/userpresets.cpp index cd551f5efe0..23f4738f594 100644 --- a/src/plugins/studiowelcome/userpresets.cpp +++ b/src/plugins/studiowelcome/userpresets.cpp @@ -48,7 +48,7 @@ void FileStoreIo::write(const QByteArray &data) QString FileStoreIo::fullFilePath(const QString &fileName) const { - return Core::ICore::userResourcePath(fileName).toString(); + return Core::ICore::userResourcePath(fileName).toUrlishString(); } UserPresetsStore::UserPresetsStore(const QString &fileName, StorePolicy policy) diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 4073543f8b0..0e489c1b2ee 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -117,7 +117,7 @@ QString SubversionClient::synchronousTopic(const FilePath &repository) const // TODO: Looks unused QStringList args; - QString svnVersionBinary = vcsBinary(repository).toString(); + QString svnVersionBinary = vcsBinary(repository).toUrlishString(); int pos = svnVersionBinary.lastIndexOf('/'); if (pos < 0) svnVersionBinary.clear(); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index e07e9ad3a26..a1973af3f1e 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -602,7 +602,7 @@ void SubversionPluginPrivate::revertAll() // NoteL: Svn "revert ." doesn not work. CommandLine args{settings().binaryPath(), {"revert"}}; args << SubversionClient::AddAuthOptions(); - args << QLatin1String("--recursive") << state.topLevel().toString(); + args << QLatin1String("--recursive") << state.topLevel().toUrlishString(); const auto revertResponse = runSvn(state.topLevel(), args, RunFlags::ShowStdOut); if (revertResponse.result() != ProcessResult::FinishedWithSuccess) { QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("Revert failed: %1") @@ -641,7 +641,7 @@ void SubversionPluginPrivate::revertCurrentFile() const auto revertResponse = runSvn(state.currentFileTopLevel(), args, RunFlags::ShowStdOut); if (revertResponse.result() == ProcessResult::FinishedWithSuccess) - emit filesChanged(QStringList(state.currentFile().toString())); + emit filesChanged(QStringList(state.currentFile().toUrlishString())); } void SubversionPluginPrivate::diffProjectDirectory() @@ -723,7 +723,7 @@ void SubversionPluginPrivate::startCommit(const FilePath &workingDir, const QStr VcsOutputWindow::appendError(saver.errorString()); return; } - m_commitMessageFileName = saver.filePath().toString(); + m_commitMessageFileName = saver.filePath().toUrlishString(); // Create a submit editor and set file list SubversionSubmitEditor *editor = openSubversionSubmitEditor(m_commitMessageFileName); QTC_ASSERT(editor, return); @@ -948,7 +948,7 @@ SubversionPluginPrivate *SubversionPluginPrivate::instance() QString SubversionPluginPrivate::monitorFile(const FilePath &repository) const { QTC_ASSERT(!repository.isEmpty(), return QString()); - QDir repoDir(repository.toString()); + QDir repoDir(repository.toUrlishString()); for (const QString &svnDir : std::as_const(m_svnDirectories)) { if (repoDir.exists(svnDir)) { QFileInfo fi(repoDir.absoluteFilePath(svnDir + QLatin1String("/wc.db"))); @@ -1015,7 +1015,7 @@ bool SubversionPluginPrivate::vcsCheckout(const FilePath &directory, const QByte args.addMaskedArg(password); } - args << QString::fromLatin1(tempUrl.toEncoded()) << directory.toString(); + args << QString::fromLatin1(tempUrl.toEncoded()) << directory.toUrlishString(); return runSvn(directory, args, RunFlags::None, nullptr, 10).result() == ProcessResult::FinishedWithSuccess; diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index eac107258ad..18165d240bc 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -431,7 +431,7 @@ std::optional<TerminalSolution::TerminalView::Link> TerminalWidget::toLink(const if (link.hasValidTarget() && (link.targetFilePath.scheme().toString().startsWith("http") || link.targetFilePath.exists())) { - return Link{link.targetFilePath.toString(), link.targetLine, link.targetColumn}; + return Link{link.targetFilePath.toUrlishString(), link.targetLine, link.targetColumn}; } } if (!m_cwd.isEmpty() && Utils::allOf(text, [](QChar c) { diff --git a/src/plugins/texteditor/bookmarkfilter.cpp b/src/plugins/texteditor/bookmarkfilter.cpp index f03b9f21902..bbe488059ff 100644 --- a/src/plugins/texteditor/bookmarkfilter.cpp +++ b/src/plugins/texteditor/bookmarkfilter.cpp @@ -93,7 +93,7 @@ LocatorFilterEntries BookmarkFilter::match(const QString &input) const else if (!bookmark->lineText().isEmpty()) entry.extraInfo = bookmark->lineText(); else - entry.extraInfo = bookmark->filePath().toString(); + entry.extraInfo = bookmark->filePath().toUrlishString(); int highlightIndex = entry.displayName.indexOf(input, 0, Qt::CaseInsensitive); if (highlightIndex >= 0) { entry.highlightInfo = {highlightIndex, int(input.length())}; diff --git a/src/plugins/texteditor/bookmarkmanager.cpp b/src/plugins/texteditor/bookmarkmanager.cpp index 930503a927f..3e22d9fff77 100644 --- a/src/plugins/texteditor/bookmarkmanager.cpp +++ b/src/plugins/texteditor/bookmarkmanager.cpp @@ -994,7 +994,7 @@ QString BookmarkManager::bookmarkToString(const Bookmark *b) const QLatin1Char colon(':'); // Using \t as delimiter because any another symbol can be a part of note. const QLatin1Char noteDelimiter('\t'); - return colon + b->filePath().toString() + + return colon + b->filePath().toUrlishString() + colon + QString::number(b->lineNumber()) + noteDelimiter + b->note(); } diff --git a/src/plugins/texteditor/colorscheme.cpp b/src/plugins/texteditor/colorscheme.cpp index ed653518219..9963ea30592 100644 --- a/src/plugins/texteditor/colorscheme.cpp +++ b/src/plugins/texteditor/colorscheme.cpp @@ -292,7 +292,7 @@ bool ColorSchemeReader::read(const FilePath &filePath, ColorScheme *scheme) if (m_scheme) m_scheme->clear(); - QFile file(filePath.toString()); + QFile file(filePath.toUrlishString()); if (!file.open(QFile::ReadOnly | QFile::Text)) return false; diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index e28abd73663..aea64a89f46 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -74,7 +74,7 @@ static FormatOutput format(const FormatInput &input) // Format temporary file QStringList options = input.command.options(); - options.replaceInStrings(QLatin1String("%file"), sourceFile.filePath().toString()); + options.replaceInStrings(QLatin1String("%file"), sourceFile.filePath().toUrlishString()); Process process; process.setCommand({executable, options}); process.runBlocking(5s); @@ -99,7 +99,7 @@ static FormatOutput format(const FormatInput &input) Process process; QStringList options = input.command.options(); options.replaceInStrings("%filename", input.filePath.fileName()); - options.replaceInStrings("%file", input.filePath.toString()); + options.replaceInStrings("%file", input.filePath.toUrlishString()); process.setCommand({executable, options}); process.setWriteData(input.sourceData.toUtf8()); process.start(); diff --git a/src/plugins/texteditor/highlighterhelper.cpp b/src/plugins/texteditor/highlighterhelper.cpp index 0a48eb361a2..f8c8e8a42e1 100644 --- a/src/plugins/texteditor/highlighterhelper.cpp +++ b/src/plugins/texteditor/highlighterhelper.cpp @@ -42,7 +42,7 @@ static KSyntaxHighlighting::Repository *highlightRepository() if (!repository) { repository = new KSyntaxHighlighting::Repository(); repository->addCustomSearchPath( - TextEditorSettings::highlighterSettings().definitionFilesPath().toString()); + TextEditorSettings::highlighterSettings().definitionFilesPath().toUrlishString()); const FilePath dir = Core::ICore::resourcePath("generic-highlighter/syntax"); if (dir.exists()) repository->addCustomSearchPath(dir.parentDir().path()); @@ -142,7 +142,7 @@ Definitions definitionsForFileName(const FilePath &fileName) const Definition &rememberedDefinition = fileExtension.isEmpty() ? definitionForSetting(kDefinitionForFilePath, - fileName.absoluteFilePath().toString()) + fileName.absoluteFilePath().toUrlishString()) : definitionForSetting(kDefinitionForExtension, fileExtension); if (rememberedDefinition.isValid() && definitions.contains(rememberedDefinition)) definitions = {rememberedDefinition}; @@ -172,7 +172,7 @@ void rememberDefinitionForDocument(const Definition &definition, } else if (!path.isEmpty()) { const Key id(kDefinitionForFilePath); QMap<QString, QVariant> map = settings->value(id).toMap(); - map.insert(path.absoluteFilePath().toString(), definition.name()); + map.insert(path.absoluteFilePath().toUrlishString(), definition.name()); settings->setValue(id, map); } } else if (!mimeType.isEmpty()) { @@ -196,7 +196,7 @@ void clearDefinitionForDocumentCache() void addCustomHighlighterPath(const FilePath &path) { - highlightRepository()->addCustomSearchPath(path.toString()); + highlightRepository()->addCustomSearchPath(path.toUrlishString()); } void downloadDefinitions(std::function<void()> callback) @@ -261,7 +261,7 @@ QFuture<QTextDocument *> highlightCode(const QString &code, const QString &mimeT auto definition = definitions.first(); const QString definitionFilesPath - = TextEditorSettings::highlighterSettings().definitionFilesPath().toString(); + = TextEditorSettings::highlighterSettings().definitionFilesPath().toUrlishString(); Highlighter *highlighter = new Highlighter(definitionFilesPath); QObject::connect(highlighter, &Highlighter::finished, document, [document, promise]() { diff --git a/src/plugins/texteditor/highlightersettingspage.cpp b/src/plugins/texteditor/highlightersettingspage.cpp index 0e395fbd33d..1326e73c732 100644 --- a/src/plugins/texteditor/highlightersettingspage.cpp +++ b/src/plugins/texteditor/highlightersettingspage.cpp @@ -40,7 +40,7 @@ public: void migrateGenericHighlighterFiles() { - QDir userDefinitionPath(m_settings.definitionFilesPath().toString()); + QDir userDefinitionPath(m_settings.definitionFilesPath().toUrlishString()); if (userDefinitionPath.mkdir("syntax")) { const auto link = Utils::HostOsInfo::isAnyUnixHost() ? static_cast<bool(*)(const QString &, const QString &)>(&QFile::link) diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp index f799b3fe424..d373088711a 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.cpp +++ b/src/plugins/texteditor/snippets/snippetscollection.cpp @@ -332,7 +332,7 @@ void SnippetsCollection::writeSnippetXML(const Snippet &snippet, QXmlStreamWrite QList<Snippet> SnippetsCollection::readXML(const FilePath &fileName, const QString &snippetId) const { QList<Snippet> snippets; - QFile file(fileName.toString()); + QFile file(fileName.toUrlishString()); if (file.exists() && file.open(QIODevice::ReadOnly)) { QXmlStreamReader xml(&file); if (xml.readNextStartElement()) { diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp index 0e88e78b9ee..f4aabd23045 100644 --- a/src/plugins/texteditor/textdocument.cpp +++ b/src/plugins/texteditor/textdocument.cpp @@ -396,8 +396,8 @@ QAction *TextDocument::createDiffAgainstCurrentFileAction( const auto diffAgainstCurrentFile = [filePath]() { auto diffService = DiffService::instance(); auto textDocument = TextEditor::TextDocument::currentTextDocument(); - const QString leftFilePath = textDocument ? textDocument->filePath().toString() : QString(); - const QString rightFilePath = filePath().toString(); + const QString leftFilePath = textDocument ? textDocument->filePath().toUrlishString() : QString(); + const QString rightFilePath = filePath().toUrlishString(); if (diffService && !leftFilePath.isEmpty() && !rightFilePath.isEmpty()) diffService->diffFiles(leftFilePath, rightFilePath); }; diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index ae49dffbf8c..1c064d6133a 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -3988,7 +3988,7 @@ void TextEditorWidgetPrivate::configureGenericHighlighter( } const QString definitionFilesPath - = TextEditorSettings::highlighterSettings().definitionFilesPath().toString(); + = TextEditorSettings::highlighterSettings().definitionFilesPath().toUrlishString(); m_document->resetSyntaxHighlighter([definitionFilesPath, definition] { auto highlighter = new Highlighter(definitionFilesPath); highlighter->setDefinition(definition); @@ -7998,7 +7998,7 @@ bool TextEditorWidget::openLink(const Utils::Link &link, bool inNextSplit) } s; #endif - QString url = link.targetFilePath.toString(); + QString url = link.targetFilePath.toUrlishString(); if (url.startsWith(u"https://") || url.startsWith(u"https://")) { QDesktopServices::openUrl(url); return true; diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp index 4f0443bb162..afb7f999010 100644 --- a/src/plugins/todo/cpptodoitemsscanner.cpp +++ b/src/plugins/todo/cpptodoitemsscanner.cpp @@ -86,13 +86,13 @@ void CppTodoItemsScanner::processDocument(CPlusPlus::Document::Ptr doc) const int length = end - start + 1; if (length > 0) { QString commentLine = QString::fromUtf8(start, length); - processCommentLine(doc->filePath().toString(), commentLine, lineNumber, itemList); + processCommentLine(doc->filePath().toUrlishString(), commentLine, lineNumber, itemList); } from = to + 1; } } - emit itemsFetched(doc->filePath().toString(), itemList); + emit itemsFetched(doc->filePath().toUrlishString(), itemList); } } diff --git a/src/plugins/todo/qmljstodoitemsscanner.cpp b/src/plugins/todo/qmljstodoitemsscanner.cpp index 2e1f17bf3d6..e47b33aaf3d 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.cpp +++ b/src/plugins/todo/qmljstodoitemsscanner.cpp @@ -69,12 +69,12 @@ void QmlJsTodoItemsScanner::processDocument(QmlJS::Document::Ptr doc) quint32 startLine = sourceLocation.startLine; for (int j = 0; j < commentLines.count(); ++j) { const QString &commentLine = commentLines.at(j); - processCommentLine(doc->fileName().toString(), commentLine, startLine + j, itemList); + processCommentLine(doc->fileName().toUrlishString(), commentLine, startLine + j, itemList); } } - emit itemsFetched(doc->fileName().toString(), itemList); + emit itemsFetched(doc->fileName().toUrlishString(), itemList); } } diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index 469695a07d2..b0803ca3c83 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -110,7 +110,7 @@ void TodoItemsProvider::setItemsListWithinStartupProject() bool skip = false; for (const QVariant &pattern : settings[Constants::EXCLUDES_LIST_KEY].toList()) { QRegularExpression re(pattern.toString()); - if (filePath.toString().indexOf(re) != -1) { + if (filePath.toUrlishString().indexOf(re) != -1) { skip = true; break; } diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 68306fee210..f865bcdf3da 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -619,7 +619,7 @@ void CallgrindTool::handleFilterProjectCosts() Project *pro = ProjectTree::currentProject(); if (pro && m_filterProjectCosts->isChecked()) { - const QString projectDir = pro->projectDirectory().toString(); + const QString projectDir = pro->projectDirectory().toUrlishString(); m_proxyModel.setFilterBaseDir(projectDir); } else { m_proxyModel.setFilterBaseDir(QString()); @@ -856,7 +856,7 @@ void CallgrindTool::loadExternalLogFile() if (filePath.isEmpty()) return; - QFile logFile(filePath.toString()); + QFile logFile(filePath.toUrlishString()); if (!logFile.open(QIODevice::ReadOnly | QIODevice::Text)) { QString msg = Tr::tr("Callgrind: Failed to open file for reading: %1") .arg(filePath.toUserOutput()); diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 8c1600b187f..2092dbd05bd 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -258,7 +258,7 @@ void SuppressionDialog::accept() // Add file to project if there is a project containing this file on the file system. if (!ProjectExplorer::ProjectManager::projectForFile(path)) { for (ProjectExplorer::Project *p : ProjectExplorer::ProjectManager::projects()) { - if (path.startsWith(p->projectDirectory().toString())) { + if (path.startsWith(p->projectDirectory().toUrlishString())) { p->rootProjectNode()->addFiles({path}); break; } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 48794753e84..52bc09c5caf 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -300,7 +300,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel // assume this error was created by an external library QSet<QString> validFolders; for (Project *project : ProjectManager::projects()) { - validFolders << project->projectDirectory().toString(); + validFolders << project->projectDirectory().toUrlishString(); const QList<Target *> targets = project->targets(); for (const Target *target : targets) { const QList<DeployableFile> files = target->deploymentData().allFiles(); @@ -309,7 +309,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel validFolders << file.remoteDirectory(); } for (BuildConfiguration *config : target->buildConfigurations()) - validFolders << config->buildDirectory().toString(); + validFolders << config->buildDirectory().toUrlishString(); } } @@ -713,7 +713,7 @@ void MemcheckTool::heobAction() } FilePath executable = sr.command.executable(); - const QString workingDirectory = sr.workingDirectory.normalizedPathName().toString(); + const QString workingDirectory = sr.workingDirectory.normalizedPathName().toUrlishString(); const QString commandLineArguments = sr.command.arguments(); const QStringList envStrings = sr.environment.toStringList(); @@ -937,7 +937,7 @@ void MemcheckTool::setupRunner(MemcheckToolRunner *runTool) { RunControl *runControl = runTool->runControl(); m_errorModel.setRelevantFrameFinder(makeFrameFinder(transform(runControl->project()->files(Project::AllFiles), - &FilePath::toString))); + &FilePath::toUrlishString))); connect(runTool, &MemcheckToolRunner::parserError, this, &MemcheckTool::parserError); @@ -994,7 +994,7 @@ void MemcheckTool::loadExternalXmlLogFile() return; m_exitMsg.clear(); - loadXmlLogFile(filePath.toString()); + loadXmlLogFile(filePath.toUrlishString()); } void MemcheckTool::loadXmlLogFile(const QString &filePath) @@ -1354,7 +1354,7 @@ bool HeobDialog::attach() const QString HeobDialog::path() const { - return m_pathChooser->filePath().toString(); + return m_pathChooser->filePath().toUrlishString(); } void HeobDialog::keyPressEvent(QKeyEvent *e) diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index d1d521c158d..39df3afa47d 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -64,7 +64,7 @@ void SuppressionAspectPrivate::slotAddSuppression() //dialog.setHistory(conf->lastSuppressionDialogHistory()); if (!files.isEmpty()) { for (const FilePath &file : files) - m_model.appendRow(new QStandardItem(file.toString())); + m_model.appendRow(new QStandardItem(file.toUrlishString())); globalSettings().lastSuppressionDirectory.setValue(files.at(0).absolutePath()); //conf->setLastSuppressionDialogHistory(dialog.history()); if (!isGlobal) diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index d2ee214109d..a57d3014ce5 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -350,7 +350,7 @@ void VcsBaseClient::annotate(const Utils::FilePath &workingDir, const QString &f QStringList args; args << vcsCmdString << revisionSpec(revision) << extraOptions << file; const Id kind = vcsEditorKind(AnnotateCommand); - const QString id = VcsBaseEditor::getSource(workingDir, QStringList(file)).toString(); + const QString id = VcsBaseEditor::getSource(workingDir, QStringList(file)).toUrlishString(); const QString title = vcsEditorTitle(vcsCmdString, id); const FilePath source = VcsBaseEditor::getSource(workingDir, file); @@ -453,7 +453,7 @@ void VcsBaseClient::revertFile(const FilePath &workingDir, args << revisionSpec(revision) << extraOptions << file; // Indicate repository change or file list VcsCommand *cmd = createCommand(workingDir); - const QStringList files = QStringList(workingDir.pathAppended(file).toString()); + const QStringList files = QStringList(workingDir.pathAppended(file).toUrlishString()); connect(cmd, &VcsCommand::done, this, [this, files, cmd] { if (cmd->result() == ProcessResult::FinishedWithSuccess) emit changed(files); @@ -469,7 +469,7 @@ void VcsBaseClient::revertAll(const FilePath &workingDir, args << revisionSpec(revision) << extraOptions; // Indicate repository change or file list VcsCommand *cmd = createCommand(workingDir); - const QStringList files = QStringList(workingDir.toString()); + const QStringList files = QStringList(workingDir.toUrlishString()); connect(cmd, &VcsCommand::done, this, [this, files, cmd] { if (cmd->result() == ProcessResult::FinishedWithSuccess) emit changed(files); @@ -562,7 +562,7 @@ void VcsBaseClient::update(const FilePath &repositoryRoot, const QString &revisi VcsCommand *cmd = createCommand(repositoryRoot); connect(cmd, &VcsCommand::done, this, [this, repositoryRoot, cmd] { if (cmd->result() == ProcessResult::FinishedWithSuccess) - emit changed(repositoryRoot.toString()); + emit changed(repositoryRoot.toUrlishString()); }); enqueueJob(cmd, args, repositoryRoot); } diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 12d9d28163b..2a120aa0731 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -98,7 +98,7 @@ QByteArray DiffChunk::asPatch(const FilePath &workingDirectory) const { const FilePath relativeFile = workingDirectory.isEmpty() ? fileName : fileName.relativeChildPath(workingDirectory); - const QByteArray fileNameBA = QFile::encodeName(relativeFile.toString()); + const QByteArray fileNameBA = QFile::encodeName(relativeFile.toUrlishString()); QByteArray rc = "--- "; rc += fileNameBA; rc += "\n+++ "; @@ -1355,7 +1355,7 @@ QString VcsBaseEditor::getTitleId(const FilePath &workingDirectory, QString rc; switch (nonEmptyFileNames.size()) { case 0: - rc = workingDirectory.toString(); + rc = workingDirectory.toUrlishString(); break; case 1: rc = nonEmptyFileNames.front(); @@ -1424,7 +1424,7 @@ QString VcsBaseEditorWidget::findDiffFile(const QString &f) const if (!d->m_workingDirectory.isEmpty()) { const FilePath baseFileInfo = d->m_workingDirectory.pathAppended(f); if (baseFileInfo.isFile()) - return baseFileInfo.absoluteFilePath().toString(); + return baseFileInfo.absoluteFilePath().toUrlishString(); } // 2) Try in source (which can be file or directory) const FilePath sourcePath = source(); @@ -1433,7 +1433,7 @@ QString VcsBaseEditorWidget::findDiffFile(const QString &f) const : sourcePath.absolutePath(); const FilePath sourceFileInfo = sourceDir.pathAppended(f); if (sourceFileInfo.isFile()) - return sourceFileInfo.absoluteFilePath().toString(); + return sourceFileInfo.absoluteFilePath().toUrlishString(); const FilePath topLevel = VcsManager::findTopLevelForDirectory(sourceDir); @@ -1442,7 +1442,7 @@ QString VcsBaseEditorWidget::findDiffFile(const QString &f) const const FilePath topLevelFile = topLevel.pathAppended(f); if (topLevelFile.isFile()) - return topLevelFile.absoluteFilePath().toString(); + return topLevelFile.absoluteFilePath().toUrlishString(); } // 3) Try working directory @@ -1472,7 +1472,7 @@ void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change) const FilePath relativePath = fileName.isRelativePath() ? fileName : fileName.relativeChildPath(workingDirectory); - emit annotateRevisionRequested(workingDirectory, relativePath.toString(), change, currentLine); + emit annotateRevisionRequested(workingDirectory, relativePath.toUrlishString(), change, currentLine); } QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const @@ -1618,7 +1618,7 @@ QString VcsBaseEditor::editorTag(EditorContentType t, const FilePath &workingDir rc += revision; rc += colon; } - rc += workingDirectory.toString(); + rc += workingDirectory.toUrlishString(); if (!files.isEmpty()) { rc += colon; rc += files.join(QString(colon)); diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 8bd270daf3a..8442d27b7df 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -382,7 +382,7 @@ QString VcsBasePluginState::relativeCurrentFile() const QString VcsBasePluginState::currentPatchFile() const { - return data->m_state.currentPatchFile.toString(); + return data->m_state.currentPatchFile.toUrlishString(); } QString VcsBasePluginState::currentPatchFileDisplayName() const @@ -408,7 +408,7 @@ FilePath VcsBasePluginState::currentProjectTopLevel() const QString VcsBasePluginState::relativeCurrentProject() const { QTC_ASSERT(hasProject(), return QString()); - return data->m_state.currentProjectPath.relativeChildPath(data->m_state.currentProjectTopLevel).toString(); + return data->m_state.currentProjectPath.relativeChildPath(data->m_state.currentProjectTopLevel).toUrlishString(); } bool VcsBasePluginState::hasTopLevel() const diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index c06c3116b6d..beefcbc9469 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -126,7 +126,7 @@ void VcsPlugin::initialize() expander->registerVariable(Constants::VAR_VCS_TOPLEVELPATH, Tr::tr("The top level path to the repository the current project is in."), [] { if (Project *project = ProjectTree::currentProject()) - return VcsManager::findTopLevelForDirectory(project->projectDirectory()).toString(); + return VcsManager::findTopLevelForDirectory(project->projectDirectory()).toUrlishString(); return QString(); }); diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp index 89f239ac6a3..03da1e0afbc 100644 --- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp +++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp @@ -79,7 +79,7 @@ static CommandLine emrunCommand(const Target *target, args.append(port); args.append("--no_emrun_detect"); args.append("--serve_after_close"); - args.append(html.toString()); + args.append(html.toUrlishString()); return CommandLine(pythonInterpreter(env), args); } diff --git a/src/tools/buildoutputparser/outputprocessor.cpp b/src/tools/buildoutputparser/outputprocessor.cpp index f8aa03d612c..5b77b26681b 100644 --- a/src/tools/buildoutputparser/outputprocessor.cpp +++ b/src/tools/buildoutputparser/outputprocessor.cpp @@ -61,7 +61,7 @@ void CompilerOutputProcessor::start() void CompilerOutputProcessor::handleTask(const ProjectExplorer::Task &task) { - const QString &fileName = task.file.toString(); + const QString &fileName = task.file.toUrlishString(); if (!fileName.isEmpty()) { *m_ostream << fileName; if (task.line != -1) diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.cpp b/src/tools/qtcreatorcrashhandler/crashhandler.cpp index 59b4021bbba..9255d37cb2f 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandler.cpp @@ -277,7 +277,7 @@ void CrashHandler::debugApplication() } // Prepare command. - QString executable = d->creatorInPath.toString(); + QString executable = d->creatorInPath.toUrlishString(); if (executable.isEmpty() && !d->restartAppCommandLine.isEmpty()) executable = d->restartAppCommandLine.at(0); const QStringList commandLine = QStringList({executable, "-debug", QString::number(d->pid)}); |