From 39aa3252452b005c9b36cd75326e8460383d14da Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 24 Jul 2019 11:01:47 +0200 Subject: [PATCH] Fix compile after FileName drop Amends 44acfc0702d0. Change-Id: I1bddb0642e181b0a02d4ecba7ff1ae282218338f Reviewed-by: hjk --- src/plugins/baremetal/iarewtoolchain.cpp | 2 +- src/plugins/clangformat/clangformatplugin.cpp | 2 +- .../compilationdatabaseproject.cpp | 2 +- tests/auto/utils/settings/tst_settings.cpp | 12 ++++++------ .../unit/mockup/projectexplorer/buildconfiguration.h | 2 +- tests/unit/mockup/projectexplorer/kitinformation.h | 2 +- tests/unit/mockup/projectexplorer/project.h | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index c4c03e7d7ca..3235ee53933 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -433,7 +433,7 @@ QList IarToolChainFactory::autoDetect(const QList &alr if (!compilerPath.isEmpty()) { // Build full compiler path. compilerPath += entry.subExePath; - const FileName fn = FileName::fromString(compilerPath); + const FilePath fn = FilePath::fromString(compilerPath); if (compilerExists(fn)) { // Note: threeLevelKey is a guessed toolchain version. candidates.push_back({fn, threeLevelKey}); diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp index 493f19c3e2b..50775d1c15a 100644 --- a/src/plugins/clangformat/clangformatplugin.cpp +++ b/src/plugins/clangformat/clangformatplugin.cpp @@ -135,7 +135,7 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS const QString fileName = openClangFormatConfigAction->data().toString(); if (!fileName.isEmpty()) { const QString clangFormatConfigPath = configForFile( - Utils::FileName::fromString(fileName)); + Utils::FilePath::fromString(fileName)); Core::EditorManager::openEditor(clangFormatConfigPath); } }); diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index ff08ee79185..4c4eb20a7e7 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -430,7 +430,7 @@ Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const #ifdef WITH_TESTS return Utils::FilePath::fromString(projectDirectory().fileName()); #else - return Utils::FileName::fromString( + return Utils::FilePath::fromString( namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString()); #endif } diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp index 10bc8afa747..5e76f7be552 100644 --- a/tests/auto/utils/settings/tst_settings.cpp +++ b/tests/auto/utils/settings/tst_settings.cpp @@ -602,7 +602,7 @@ void tst_SettingsAccessor::findIssues_ok() { const TestSettingsAccessor accessor; const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID); - const Utils::FileName path = Utils::FileName::fromString("/foo/baz.user"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/baz.user"); const Utils::optional info = accessor.findIssues(data, path); @@ -613,7 +613,7 @@ void tst_SettingsAccessor::findIssues_emptyData() { const TestSettingsAccessor accessor; const QVariantMap data; - const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user"); const Utils::optional info = accessor.findIssues(data, path); @@ -624,7 +624,7 @@ void tst_SettingsAccessor::findIssues_tooNew() { const TestSettingsAccessor accessor; const QVariantMap data = versionedMap(42, TESTACCESSOR_DEFAULT_ID); - const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user"); const Utils::optional info = accessor.findIssues(data, path); @@ -635,7 +635,7 @@ void tst_SettingsAccessor::findIssues_tooOld() { const TestSettingsAccessor accessor; const QVariantMap data = versionedMap(2, TESTACCESSOR_DEFAULT_ID); - const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user"); const Utils::optional info = accessor.findIssues(data, path); @@ -646,7 +646,7 @@ void tst_SettingsAccessor::findIssues_wrongId() { const TestSettingsAccessor accessor; const QVariantMap data = versionedMap(6, "foo"); - const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user"); const Utils::optional info = accessor.findIssues(data, path); @@ -657,7 +657,7 @@ void tst_SettingsAccessor::findIssues_nonDefaultPath() { const TestSettingsAccessor accessor; const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID); - const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user.foobar"); + const Utils::FilePath path = Utils::FilePath::fromString("/foo/bar.user.foobar"); const Utils::optional info = accessor.findIssues(data, path); diff --git a/tests/unit/mockup/projectexplorer/buildconfiguration.h b/tests/unit/mockup/projectexplorer/buildconfiguration.h index 75b5a293c45..cc1c57e8289 100644 --- a/tests/unit/mockup/projectexplorer/buildconfiguration.h +++ b/tests/unit/mockup/projectexplorer/buildconfiguration.h @@ -32,6 +32,6 @@ namespace ProjectExplorer { class BuildConfiguration { public: - Utils::FileName buildDirectory() const { return {}; } + Utils::FilePath buildDirectory() const { return {}; } }; // namespace Target } // namespace ProjectExplorer diff --git a/tests/unit/mockup/projectexplorer/kitinformation.h b/tests/unit/mockup/projectexplorer/kitinformation.h index fced31a50f2..f8e54ae3dec 100644 --- a/tests/unit/mockup/projectexplorer/kitinformation.h +++ b/tests/unit/mockup/projectexplorer/kitinformation.h @@ -34,7 +34,7 @@ class Kit; class SysRootKitInformation { public: - static Utils::FileName sysRoot(const Kit *) { return Utils::FileName(); } + static Utils::FilePath sysRoot(const Kit *) { return Utils::FilePath(); } }; } // namespace ProjectExplorer diff --git a/tests/unit/mockup/projectexplorer/project.h b/tests/unit/mockup/projectexplorer/project.h index c69eb6e47ba..0cf902c8f91 100644 --- a/tests/unit/mockup/projectexplorer/project.h +++ b/tests/unit/mockup/projectexplorer/project.h @@ -37,16 +37,16 @@ class Project : public QObject { public: Project() = default; - Utils::FileName projectDirectory() const { return {}; } + Utils::FilePath projectDirectory() const { return {}; } - Utils::FileName rootProjectDirectory() const { return rootProjectDirectoryPath; } + Utils::FilePath rootProjectDirectory() const { return rootProjectDirectoryPath; } Target *activeTarget() const { return {}; } QVariant namedSettings(const QString &name) const { return settings.at(name); } void setNamedSettings(const QString &name, const QVariant &value) { settings[name] = value; } - Utils::FileName rootProjectDirectoryPath; + Utils::FilePath rootProjectDirectoryPath; mutable std::map settings; }; } // namespace ProjectExplorer