ProjectExplorer: Rename BaseStringAspect::{f,setF}ileName

... to filePath and setFilePath. In line with Utils::FilePath.

Change-Id: I7115b91876542629c3d61c8259bbd8d9f4022fc1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

12 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index 03fa4e8e42..d1abe58229 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -117,7 +117,7 @@ void QdbRunConfiguration::updateTargetInformation()
     const DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
 
     aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-    aspect<SymbolFileAspect>()->setFileName(localExecutable);
+    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
 }
 
 QString QdbRunConfiguration::defaultDisplayName() const
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 73c7080c2e..a740c741d5 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -911,7 +911,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
     m_runParameters.displayName = runControl->displayName();
 
     if (auto symbolsAspect = runControl->aspect<SymbolFileAspect>())
-        m_runParameters.symbolFile = symbolsAspect->fileName();
+        m_runParameters.symbolFile = symbolsAspect->filePath();
     if (auto terminalAspect = runControl->aspect<TerminalAspect>())
         m_runParameters.useTerminal = terminalAspect->useTerminal();
 
diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp
index 2884aa9e16..03fa8fd67b 100644
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -51,7 +51,7 @@ NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList)
     workingDirectory->setDisplayStyle(BaseStringAspect::LineEditDisplay);
 
     setSummaryUpdater([this, workingDirectory] {
-        workingDirectory->setFileName(buildConfiguration()->buildDirectory());
+        workingDirectory->setFilePath(buildConfiguration()->buildDirectory());
         return displayName();
     });
 }
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index d35aa5dbc3..e53728b5a1 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -126,14 +126,14 @@ Utils::FilePath BuildConfiguration::buildDirectory() const
 
 Utils::FilePath BuildConfiguration::rawBuildDirectory() const
 {
-    return m_buildDirectoryAspect->fileName();
+    return m_buildDirectoryAspect->filePath();
 }
 
 void BuildConfiguration::setBuildDirectory(const Utils::FilePath &dir)
 {
-    if (dir == m_buildDirectoryAspect->fileName())
+    if (dir == m_buildDirectoryAspect->filePath())
         return;
-    m_buildDirectoryAspect->setFileName(dir);
+    m_buildDirectoryAspect->setFilePath(dir);
     emitBuildDirectoryChanged();
 }
 
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 26d9a976f8..89062879d3 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -105,7 +105,7 @@ void ProcessStep::setupProcessParameters(ProcessParameters *pp)
     pp->setMacroExpander(bc ? bc->macroExpander() : Utils::globalMacroExpander());
     pp->setEnvironment(bc ? bc->environment() : Utils::Environment::systemEnvironment());
     pp->setWorkingDirectory(Utils::FilePath::fromString(workingDirectory));
-    pp->setCommandLine({m_command->fileName(), m_arguments->value(), CommandLine::Raw});
+    pp->setCommandLine({m_command->filePath(), m_arguments->value(), CommandLine::Raw});
     pp->resolveAll();
 }
 
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.cpp b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
index 792a9ae3c0..692c5d77b9 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
@@ -153,12 +153,12 @@ void BaseStringAspect::toMap(QVariantMap &map) const
         d->m_checker->toMap(map);
 }
 
-FilePath BaseStringAspect::fileName() const
+FilePath BaseStringAspect::filePath() const
 {
     return FilePath::fromString(d->m_value);
 }
 
-void BaseStringAspect::setFileName(const FilePath &val)
+void BaseStringAspect::setFilePath(const FilePath &val)
 {
     setValue(val.toString());
 }
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.h b/src/plugins/projectexplorer/projectconfigurationaspects.h
index b1a4a06c53..3195ad63fc 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.h
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.h
@@ -133,8 +133,8 @@ public:
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
 
-    Utils::FilePath fileName() const;
-    void setFileName(const Utils::FilePath &val);
+    Utils::FilePath filePath() const;
+    void setFilePath(const Utils::FilePath &val);
 
 private:
     void update();
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index e5a8f54337..0358dd54a5 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -445,9 +445,9 @@ void ExecutableAspect::makeOverridable(const QString &overridingKey, const QStri
 FilePath ExecutableAspect::executable() const
 {
     if (m_alternativeExecutable && m_alternativeExecutable->isChecked())
-        return m_alternativeExecutable->fileName();
+        return m_alternativeExecutable->filePath();
 
-    return m_executable.fileName();
+    return m_executable.filePath();
 }
 
 void ExecutableAspect::addToConfigurationLayout(QFormLayout *layout)
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 37809a9e44..8b5cde356a 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -261,7 +261,7 @@ void QnxAttachDebugSupport::showProcessesDialog()
     FilePath localExecutable = dlg.localExecutable();
     if (localExecutable.isEmpty()) {
         if (auto aspect = runConfig->aspect<SymbolFileAspect>())
-            localExecutable = aspect->fileName();
+            localExecutable = aspect->filePath();
     }
 
     auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE);
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index eba7121653..d9b3522207 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -75,7 +75,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
         const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable);
 
         exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-        symbolsAspect->setFileName(localExecutable);
+        symbolsAspect->setFilePath(localExecutable);
 
         emit enabledChanged();
     };
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 466cfa97b2..3c2b798ca5 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -85,7 +85,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent) : MakeStep(parent, stepI
     commandLineAspect->setLabelText(tr("Full command line:"));
 
     QTemporaryDir tmpDir;
-    installRootAspect->setFileName(FilePath::fromString(tmpDir.path()));
+    installRootAspect->setFilePath(FilePath::fromString(tmpDir.path()));
     const MakeInstallCommand cmd = target()->makeInstallCommand(tmpDir.path());
     QTC_ASSERT(!cmd.command.isEmpty(), return);
     makeAspect->setExecutable(cmd.command);
@@ -188,7 +188,7 @@ void MakeInstallStep::stdError(const QString &line)
 
 FilePath MakeInstallStep::installRoot() const
 {
-    return static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->fileName();
+    return static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->filePath();
 }
 
 bool MakeInstallStep::cleanInstallRoot() const
@@ -205,7 +205,7 @@ void MakeInstallStep::updateCommandFromAspect()
 void MakeInstallStep::updateArgsFromAspect()
 {
     setUserArguments(QtcProcess::joinArgs(target()->makeInstallCommand(
-        static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->fileName().toString())
+        static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->filePath().toString())
                                           .arguments));
     updateFullCommandLine();
 }
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index e243661553..745858dd41 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -94,7 +94,7 @@ void RemoteLinuxRunConfiguration::updateTargetInformation()
     DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
 
     aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-    aspect<SymbolFileAspect>()->setFileName(localExecutable);
+    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
 
     emit enabledChanged();
 }