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

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