diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 8571bffe3c3..b84a2abc73c 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -841,18 +841,6 @@ FilePath StringAspect::filePath() const return FilePath::fromUserInput(value()); } -/*! - Sets the value of this string aspect to \a value. - - \note This simply uses \c FilePath::toUserOutput() for the - conversion. It does not use any check that the value is actually - a file path. -*/ -void StringAspect::setFilePath(const FilePath &value) -{ - setValue(value.toUserOutput()); -} - PathChooser *StringAspect::pathChooser() const { return d->m_pathChooserDisplay.data(); @@ -1324,6 +1312,13 @@ FilePathAspect::FilePathAspect(AspectContainer *container) setDisplayStyle(PathChooserDisplay); } +/*! + Sets the value of this file path aspect to \a value. + + \note This does not use any check that the value is actually + a file path. +*/ + void FilePathAspect::setValue(const FilePath &filePath) { StringAspect::setValue(filePath.toUserOutput()); diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 8d9307e6685..72c35d4c5a0 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -502,7 +502,6 @@ public: void toMap(QVariantMap &map) const override; FilePath filePath() const; - void setFilePath(const FilePath &value); PathChooser *pathChooser() const; // Avoid to use. diff --git a/src/plugins/axivion/axivionsettings.cpp b/src/plugins/axivion/axivionsettings.cpp index 4a183631633..c3ecba69c13 100644 --- a/src/plugins/axivion/axivionsettings.cpp +++ b/src/plugins/axivion/axivionsettings.cpp @@ -124,7 +124,7 @@ void AxivionSettings::fromSettings(QSettings *s) const QString curlPath = QStandardPaths::findExecutable( Utils::HostOsInfo::withExecutableSuffix("curl")); if (!curlPath.isEmpty()) - curl.setFilePath(Utils::FilePath::fromString(curlPath)); + curl.setValue(Utils::FilePath::fromString(curlPath)); } } diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp index d288289dfa7..e936d3ebc68 100644 --- a/src/plugins/boot2qt/qdbrunconfiguration.cpp +++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp @@ -92,7 +92,7 @@ QdbRunConfiguration::QdbRunConfiguration(Target *target, Id id) IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit()); QTC_ASSERT(dev, return); exeAspect->setExecutable(dev->filePath(depFile.remoteFilePath())); - symbolsAspect->setFilePath(localExecutable); + symbolsAspect->setValue(localExecutable); }); connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 3bb546fc066..76261a01dd7 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -2042,7 +2042,7 @@ BuildSystem *CMakeBuildConfiguration::buildSystem() const void CMakeBuildConfiguration::setSourceDirectory(const FilePath &path) { - aspect()->setFilePath(path); + aspect()->setValue(path); } FilePath CMakeBuildConfiguration::sourceDirectory() const diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp index 2a634190365..7d03398205d 100644 --- a/src/plugins/conan/conaninstallstep.cpp +++ b/src/plugins/conan/conaninstallstep.cpp @@ -72,7 +72,7 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id) auto conanFile = addAspect(); conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile"); - conanFile->setFilePath(conanFilePath(project(), + conanFile->setValue(conanFilePath(project(), project()->projectDirectory() / "conanfile.txt")); conanFile->setLabelText(Tr::tr("Conan file:")); conanFile->setToolTip(Tr::tr("Enter location of conanfile.txt or conanfile.py.")); diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp index 4660cc92bb5..48ec0fda00d 100644 --- a/src/plugins/gitlab/gitlaboptionspage.cpp +++ b/src/plugins/gitlab/gitlaboptionspage.cpp @@ -178,7 +178,7 @@ GitLabOptionsWidget::GitLabOptionsWidget(GitLabParameters *params) }, Column { m_add, m_edit, m_remove, st }, }.attachTo(this); - m_curl.setFilePath(params->curl); + m_curl.setValue(params->curl); for (const auto &gitLabServer : params->gitLabServers) { m_defaultGitLabServer->addItem(gitLabServer.displayString(), diff --git a/src/plugins/mcusupport/mcubuildstep.cpp b/src/plugins/mcusupport/mcubuildstep.cpp index 3b0c639df5e..dc3812d0423 100644 --- a/src/plugins/mcusupport/mcubuildstep.cpp +++ b/src/plugins/mcusupport/mcubuildstep.cpp @@ -78,7 +78,7 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, U cmd->setSettingsKey("QmlProject.Mcu.ProcessStep.Command"); cmd->setExpectedKind(Utils::PathChooser::Command); cmd->setLabelText(QmlProjectManager::Tr::tr("Command:")); - cmd->setFilePath(rootPath.pathAppended("/bin/qmlprojectexporter")); + cmd->setValue(rootPath.pathAppended("/bin/qmlprojectexporter")); const char *importPathConstant = QtSupport::Constants::KIT_QML_IMPORT_PATH; Utils::FilePath projectDir = buildSystem()->projectDirectory(); diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp index 8e13c068131..798ba4f8a0c 100644 --- a/src/plugins/nim/project/nimcompilercleanstep.cpp +++ b/src/plugins/nim/project/nimcompilercleanstep.cpp @@ -39,12 +39,12 @@ private: NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Id id) : BuildStep(parentList, id) { - auto workingDirectory = addAspect(); + auto workingDirectory = addAspect(); workingDirectory->setLabelText(Tr::tr("Working directory:")); workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay); setSummaryUpdater([this, workingDirectory] { - workingDirectory->setFilePath(buildDirectory()); + workingDirectory->setValue(buildDirectory()); return displayName(); }); } diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index 3f161867ef9..2ffcbc7ac8a 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/src/plugins/projectexplorer/buildaspects.cpp @@ -102,7 +102,7 @@ void BuildDirectoryAspect::fromMap(const QVariantMap &map) if (!d->sourceDir.isEmpty()) { d->savedShadowBuildDir = FilePath::fromSettings(map.value(settingsKey() + ".shadowDir")); if (d->savedShadowBuildDir.isEmpty()) - setFilePath(d->sourceDir); + setValue(d->sourceDir); setChecked(d->sourceDir != filePath()); } } @@ -117,11 +117,11 @@ void BuildDirectoryAspect::addToLayout(Layouting::LayoutItem &parent) if (!d->sourceDir.isEmpty()) { connect(this, &StringAspect::checkedChanged, this, [this] { if (isChecked()) { - setFilePath(d->savedShadowBuildDir.isEmpty() + setValue(d->savedShadowBuildDir.isEmpty() ? d->sourceDir : d->savedShadowBuildDir); } else { d->savedShadowBuildDir = filePath(); - setFilePath(d->sourceDir); + setValue(d->sourceDir); } }); } diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index a1e440d7c4e..3a7d0b4a2a0 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -246,10 +246,10 @@ void BuildConfiguration::setBuildDirectory(const FilePath &dir) { if (dir == d->m_buildDirectoryAspect->filePath()) return; - d->m_buildDirectoryAspect->setFilePath(dir); + d->m_buildDirectoryAspect->setValue(dir); const FilePath fixedDir = BuildDirectoryAspect::fixupDir(buildDirectory()); if (!fixedDir.isEmpty()) - d->m_buildDirectoryAspect->setFilePath(fixedDir); + d->m_buildDirectoryAspect->setValue(fixedDir); emitBuildDirectoryChanged(); } diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 028706fa2db..cd8ef6120ec 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -252,7 +252,7 @@ Environment MakeStep::makeEnvironment() const void MakeStep::setMakeCommand(const FilePath &command) { - m_makeCommandAspect.setFilePath(command); + m_makeCommandAspect.setValue(command); } int MakeStep::defaultJobCount() diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 5d44872439e..a2bee30265f 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -662,7 +662,7 @@ void ExecutableAspect::setPlaceHolderText(const QString &placeHolderText) */ void ExecutableAspect::setExecutable(const FilePath &executable) { - m_executable.setFilePath(executable); + m_executable.setValue(executable); m_executable.setShowToolTipOnLabel(true); } diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h index f7e3e4c4211..6c58a660722 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.h +++ b/src/plugins/projectexplorer/runconfigurationaspects.h @@ -190,7 +190,7 @@ private: ExecutionDeviceSelector m_selector = RunDevice; }; -class PROJECTEXPLORER_EXPORT SymbolFileAspect : public Utils::StringAspect +class PROJECTEXPLORER_EXPORT SymbolFileAspect : public Utils::FilePathAspect { Q_OBJECT diff --git a/src/plugins/python/pysidebuildconfiguration.cpp b/src/plugins/python/pysidebuildconfiguration.cpp index 5f6f7dadea5..51c97bd40bd 100644 --- a/src/plugins/python/pysidebuildconfiguration.cpp +++ b/src/plugins/python/pysidebuildconfiguration.cpp @@ -42,7 +42,7 @@ PySideBuildStep::PySideBuildStep(BuildStepList *bsl, Id id) const FilePath pySideProjectPath = FilePath("pyside6-project").searchInPath(); if (pySideProjectPath.isExecutableFile()) - m_pysideProject.setFilePath(pySideProjectPath); + m_pysideProject.setValue(pySideProjectPath); setCommandLineProvider([this] { return CommandLine(m_pysideProject(), {"build"}); }); setWorkingDirectoryProvider([this] { @@ -55,7 +55,7 @@ PySideBuildStep::PySideBuildStep(BuildStepList *bsl, Id id) void PySideBuildStep::updatePySideProjectPath(const FilePath &pySideProjectPath) { - m_pysideProject.setFilePath(pySideProjectPath); + m_pysideProject.setValue(pySideProjectPath); } void PySideBuildStep::doRun() diff --git a/src/plugins/python/pythonwizardpage.cpp b/src/plugins/python/pythonwizardpage.cpp index 59ecebf688a..4a8fb800c70 100644 --- a/src/plugins/python/pythonwizardpage.cpp +++ b/src/plugins/python/pythonwizardpage.cpp @@ -133,7 +133,7 @@ void PythonWizardPage::initializePage() const FilePath projectDir = FilePath::fromString(wiz->property("ProjectDirectory").toString()); m_createVenv.setValue(!projectDir.isEmpty()); if (m_venvPath.filePath().isEmpty()) - m_venvPath.setFilePath(projectDir.isEmpty() ? FilePath{} : projectDir / "venv"); + m_venvPath.setValue(projectDir.isEmpty() ? FilePath{} : projectDir / "venv"); updateInterpreters(); updateStateLabel(); diff --git a/src/plugins/qmlprofiler/qmlprofilersettings.h b/src/plugins/qmlprofiler/qmlprofilersettings.h index 14e35676215..b53622cabc5 100644 --- a/src/plugins/qmlprofiler/qmlprofilersettings.h +++ b/src/plugins/qmlprofiler/qmlprofilersettings.h @@ -18,7 +18,7 @@ public: Utils::BoolAspect flushEnabled; Utils::IntegerAspect flushInterval; - Utils::StringAspect lastTraceFile; + Utils::FilePathAspect lastTraceFile; Utils::BoolAspect aggregateTraces; }; diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 4d67d7a1fd6..e84a27531af 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -568,7 +568,7 @@ static void saveLastTraceFile(const FilePath &filePath) { QmlProfilerSettings *settings = QmlProfilerPlugin::globalSettings(); if (filePath != settings->lastTraceFile.filePath()) { - settings->lastTraceFile.setFilePath(filePath); + settings->lastTraceFile.setValue(filePath); settings->writeGlobalSettings(); } } diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index e80c4d2c2ae..3367250969b 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -59,7 +59,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Id id) const DeployableFile depFile = target->deploymentData() .deployableForLocalFile(localExecutable); exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath())); - symbolsAspect->setFilePath(localExecutable); + symbolsAspect->setValue(localExecutable); }); setRunnableModifier([libAspect](Runnable &r) { diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 56c22d4ff80..5a156329eb5 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -101,7 +101,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent installRootAspect->setSettingsKey(InstallRootAspectId); installRootAspect->setExpectedKind(PathChooser::Directory); installRootAspect->setLabelText(Tr::tr("Install root:")); - installRootAspect->setFilePath(rootPath); + installRootAspect->setValue(rootPath); connect(installRootAspect, &StringAspect::changed, this, &MakeInstallStep::updateArgsFromAspect); diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 4ac92d237e2..32948f7c9f8 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -69,7 +69,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Id id) const DeployableFile depFile = deploymentData.deployableForLocalFile(localExecutable); exeAspect->setExecutable(runDevice->filePath(depFile.remoteFilePath())); - symbolsAspect->setFilePath(localExecutable); + symbolsAspect->setValue(localExecutable); libAspect->setEnabled(buildDevice == runDevice); }); diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index 55c6a3543ce..1dbcef72035 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -70,7 +70,7 @@ void SuppressionAspectPrivate::slotAddSuppression() if (!files.isEmpty()) { for (const FilePath &file : files) m_model.appendRow(new QStandardItem(file.toString())); - conf->lastSuppressionDirectory.setFilePath(files.at(0).absolutePath()); + conf->lastSuppressionDirectory.setValue(files.at(0).absolutePath()); //conf->setLastSuppressionDialogHistory(dialog.history()); if (!isGlobal) q->apply(); diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index def8b793da7..92ac467a015 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -120,7 +120,7 @@ public: void writeSettings() const; void readSettings(); - Utils::StringAspect lastSuppressionDirectory{this}; + Utils::FilePathAspect lastSuppressionDirectory{this}; Utils::StringAspect lastSuppressionHistory{this};