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

14
src/plugins/nim/project/nimbuildconfiguration.cpp
View File

@@ -51,7 +51,7 @@ using namespace Utils;
namespace Nim {
static FileName defaultBuildDirectory(const Kit *k,
static FilePath defaultBuildDirectory(const Kit *k,
const QString &projectFilePath,
const QString &bc,
BuildConfiguration::BuildType buildType)
@@ -62,9 +62,9 @@ static FileName defaultBuildDirectory(const Kit *k,
QString buildDirectory = expander.expand(ProjectExplorerPlugin::buildDirectoryTemplate());
if (FileUtils::isAbsolutePath(buildDirectory))
return FileName::fromString(buildDirectory);
return FilePath::fromString(buildDirectory);
auto projectDir = FileName::fromString(projectFileInfo.absoluteDir().absolutePath());
auto projectDir = FilePath::fromString(projectFileInfo.absoluteDir().absolutePath());
return projectDir.pathAppended(buildDirectory);
}
@@ -106,7 +106,7 @@ void NimBuildConfiguration::initialize(const BuildInfo &info)
break;
}
nimCompilerBuildStep->setDefaultCompilerOptions(defaultOption);
Utils::FileNameList nimFiles = project->nimFiles();
Utils::FilePathList nimFiles = project->nimFiles();
if (!nimFiles.isEmpty())
nimCompilerBuildStep->setTargetNimFile(nimFiles.first());
buildSteps->appendStep(nimCompilerBuildStep);
@@ -124,15 +124,15 @@ BuildConfiguration::BuildType NimBuildConfiguration::buildType() const
return BuildConfiguration::Unknown;
}
FileName NimBuildConfiguration::cacheDirectory() const
FilePath NimBuildConfiguration::cacheDirectory() const
{
return buildDirectory().pathAppended("nimcache");
}
FileName NimBuildConfiguration::outFilePath() const
FilePath NimBuildConfiguration::outFilePath() const
{
const NimCompilerBuildStep *step = nimCompilerBuildStep();
QTC_ASSERT(step, return FileName());
QTC_ASSERT(step, return FilePath());
return step->outFilePath();
}