feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

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

Change-Id: I7115b91876542629c3d61c8259bbd8d9f4022fc1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-27 13:50:15 +02:00
parent ae11f30b20
commit f4c1c0e441
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/boot2qt/qdbrunconfiguration.cpp
View File

@@ -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

2
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -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();

2
src/plugins/nim/project/nimcompilercleanstep.cpp
View File

@@ -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();
});
}

6
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -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();
}

2
src/plugins/projectexplorer/processstep.cpp
View File

@@ -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();
}

4
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -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());
}

4
src/plugins/projectexplorer/projectconfigurationaspects.h
View File

@@ -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();

4
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -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)

2
src/plugins/qnx/qnxdebugsupport.cpp
View File

@@ -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);

2
src/plugins/qnx/qnxrunconfiguration.cpp
View File

@@ -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();
};

6
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -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();
}

2
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
View File

@@ -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();
}