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/projectexplorer/buildconfiguration.cpp
View File

@@ -102,19 +102,19 @@ BuildConfiguration::BuildConfiguration(Target *target, Core::Id id)
});
}
Utils::FileName BuildConfiguration::buildDirectory() const
Utils::FilePath BuildConfiguration::buildDirectory() const
{
QString path = environment().expandVariables(m_buildDirectoryAspect->value().trimmed());
path = QDir::cleanPath(macroExpander()->expand(path));
return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path)));
return Utils::FilePath::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path)));
}
Utils::FileName BuildConfiguration::rawBuildDirectory() const
Utils::FilePath BuildConfiguration::rawBuildDirectory() const
{
return m_buildDirectoryAspect->fileName();
}
void BuildConfiguration::setBuildDirectory(const Utils::FileName &dir)
void BuildConfiguration::setBuildDirectory(const Utils::FilePath &dir)
{
if (dir == m_buildDirectoryAspect->fileName())
return;
@@ -382,7 +382,7 @@ void BuildConfiguration::prependCompilerPathToEnvironment(Kit *k, Utils::Environ
if (!tc)
return;
const Utils::FileName compilerDir = tc->compilerCommand().parentDir();
const Utils::FilePath compilerDir = tc->compilerCommand().parentDir();
if (!compilerDir.isEmpty())
env.prependOrSetPath(compilerDir.toString());
}