aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangcodemodel/clangutils.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-28 13:49:26 +0200
committerhjk <hjk@qt.io>2019-05-28 12:23:26 +0000
commit473a741c9fcf09febba312464fab8385e2351181 (patch)
tree2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/clangcodemodel/clangutils.cpp
parent4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff)
Utils: Rename FileName to FilePath
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>
Diffstat (limited to 'src/plugins/clangcodemodel/clangutils.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangutils.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index fb06e9c384..e7d7de420a 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -301,11 +301,11 @@ QString diagnosticCategoryPrefixRemoved(const QString &text)
return text;
}
-static ::Utils::FileName compilerPath(const CppTools::ProjectPart &projectPart)
+static ::Utils::FilePath compilerPath(const CppTools::ProjectPart &projectPart)
{
ProjectExplorer::Target *target = projectPart.project->activeTarget();
if (!target)
- return ::Utils::FileName();
+ return ::Utils::FilePath();
ProjectExplorer::ToolChain *toolchain = ProjectExplorer::ToolChainKitAspect::toolChain(
target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
@@ -313,15 +313,15 @@ static ::Utils::FileName compilerPath(const CppTools::ProjectPart &projectPart)
return toolchain->compilerCommand();
}
-static ::Utils::FileName buildDirectory(const ProjectExplorer::Project &project)
+static ::Utils::FilePath buildDirectory(const ProjectExplorer::Project &project)
{
ProjectExplorer::Target *target = project.activeTarget();
if (!target)
- return ::Utils::FileName();
+ return ::Utils::FilePath();
ProjectExplorer::BuildConfiguration *buildConfig = target->activeBuildConfiguration();
if (!buildConfig)
- return ::Utils::FileName();
+ return ::Utils::FilePath();
return buildConfig->buildDirectory();
}
@@ -356,7 +356,7 @@ static QStringList projectPartArguments(const ProjectPart &projectPart)
return args;
}
-static QJsonObject createFileObject(const ::Utils::FileName &buildDir,
+static QJsonObject createFileObject(const ::Utils::FilePath &buildDir,
const QStringList &arguments,
const ProjectPart &projectPart,
const ProjectFile &projFile)
@@ -388,7 +388,7 @@ static QJsonObject createFileObject(const ::Utils::FileName &buildDir,
GenerateCompilationDbResult generateCompilationDB(CppTools::ProjectInfo projectInfo)
{
- const ::Utils::FileName buildDir = buildDirectory(*projectInfo.project());
+ const ::Utils::FilePath buildDir = buildDirectory(*projectInfo.project());
QTC_ASSERT(!buildDir.isEmpty(), return GenerateCompilationDbResult(QString(),
QCoreApplication::translate("ClangUtils", "Could not retrieve build directory.")));