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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -223,7 +223,7 @@ bool QMakeStep::init()
ProcessParameters *pp = processParameters();
pp->setMacroExpander(qmakeBc->macroExpander());
pp->setWorkingDirectory(Utils::FileName::fromString(workingDirectory));
pp->setWorkingDirectory(Utils::FilePath::fromString(workingDirectory));
pp->setEnvironment(qmakeBc->environment());
setOutputParser(new QMakeParser);
@@ -311,7 +311,7 @@ void QMakeStep::finish(bool success)
runNextCommand();
}
void QMakeStep::startOneCommand(const FileName &command, const QString &args)
void QMakeStep::startOneCommand(const FilePath &command, const QString &args)
{
ProcessParameters *pp = processParameters();
pp->setCommand(command);
@@ -436,10 +436,10 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
}
FileName QMakeStep::makeCommand() const
FilePath QMakeStep::makeCommand() const
{
auto ms = qobject_cast<BuildStepList *>(parent())->firstOfType<MakeStep>();
return ms ? ms->effectiveMakeCommand() : FileName();
return ms ? ms->effectiveMakeCommand() : FilePath();
}
QString QMakeStep::makeArguments(const QString &makefile) const
@@ -498,7 +498,7 @@ QString QMakeStep::mkspec() const
for (QtcProcess::ArgIterator ait(&additionalArguments); ait.next(); ) {
if (ait.value() == "-spec") {
if (ait.next())
return FileName::fromUserInput(ait.value()).toString();
return FilePath::fromUserInput(ait.value()).toString();
}
}