diff options
author | hjk <hjk@qt.io> | 2022-11-21 13:24:40 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2022-11-21 12:46:11 +0000 |
commit | e567cb313bde692f888ab4968fbd784a42f3a761 (patch) | |
tree | e8637a0bbaebf573797397e4d981c8bd3b0236f8 | |
parent | fbc2da621caba3984ec6431e75da39a5b486ae14 (diff) | |
download | qt-creator-e567cb313bde692f888ab4968fbd784a42f3a761.tar.gz |
Core: Use FilePath for working dir in MainWindow::openFiles()
Change-Id: Ifc8e167a1734115fa7a23f7aefa45fc52e4a70cc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | src/plugins/coreplugin/coreplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 8 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index bd5a65cc97..3cb41fa1b5 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -309,7 +309,7 @@ QObject *CorePlugin::remoteCommand(const QStringList & /* options */, IDocument *res = MainWindow::openFiles( filePaths, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineAndColumnNumbers | ICore::SwitchSplitIfAlreadyVisible), - workingDirectory); + FilePath::fromString(workingDirectory)); m_mainWindow->raiseWindow(); return res; } diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 9c63e36e70..ee9bffe3a9 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -973,20 +973,20 @@ static IDocumentFactory *findDocumentFactory(const QList<IDocumentFactory*> &fil */ IDocument *MainWindow::openFiles(const FilePaths &filePaths, ICore::OpenFilesFlags flags, - const QString &workingDirectory) + const FilePath &workingDirectory) { const QList<IDocumentFactory*> documentFactories = IDocumentFactory::allDocumentFactories(); IDocument *res = nullptr; - const QString workingDirBase = workingDirectory.isEmpty() ? QDir::currentPath() : workingDirectory; + const FilePath workingDirBase = + workingDirectory.isEmpty() ? FilePath::currentWorkingPath() : workingDirectory; for (const FilePath &filePath : filePaths) { - const FilePath workingDir = filePath.withNewPath(workingDirBase); FilePath absoluteFilePath; if (filePath.isAbsolutePath()) { absoluteFilePath = filePath; } else { QTC_CHECK(!filePath.needsDevice()); - absoluteFilePath = FilePath::fromString(workingDirBase).resolvePath(filePath.path()); + absoluteFilePath = workingDirBase.resolvePath(filePath.path()); } if (IDocumentFactory *documentFactory = findDocumentFactory(documentFactories, filePath)) { IDocument *document = documentFactory->open(absoluteFilePath); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 7266cbb037..0eacd9b436 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -70,7 +70,7 @@ public: static IDocument *openFiles(const Utils::FilePaths &filePaths, ICore::OpenFilesFlags flags, - const QString &workingDirectory = QString()); + const Utils::FilePath &workingDirectory = {}); inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; } virtual QPrinter *printer() const; |