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

ProjectExplorer: Remove effectively unused enum

Browse Source 
Change-Id: Ie4f23e5658e57a367ab77c2cc40443f32a60a8d0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2022-06-03 12:02:17 +02:00
parent 8690bec140
commit 510bbea59a
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1370,7 +1370,7 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
const QString projectName = projectFilePath.parentDir().fileName(); const QString projectName = projectFilePath.parentDir().fileName();
const FilePath projectDir = Project::projectDirectory(projectFilePath); const FilePath projectDir = Project::projectDirectory(projectFilePath);
FilePath buildPath = BuildConfiguration::buildDirectoryFromTemplate(projectDir, FilePath buildPath = BuildConfiguration::buildDirectoryFromTemplate(projectDir,
projectFilePath, projectName, k, bcName, buildType, BuildConfiguration::ReplaceSpaces); projectFilePath, projectName, k, bcName, buildType);
if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) { if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) {
QString path = buildPath.path(); QString path = buildPath.path();

2
src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
View File

@@ -85,7 +85,7 @@ FilePath MesonBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
const QString projectName = projectFilePath.parentDir().fileName(); const QString projectName = projectFilePath.parentDir().fileName();
return BuildConfiguration::buildDirectoryFromTemplate( return BuildConfiguration::buildDirectoryFromTemplate(
Project::projectDirectory(projectFilePath), Project::projectDirectory(projectFilePath),
projectFilePath, projectName, k, bcName, buildType, BuildConfiguration::ReplaceSpaces); projectFilePath, projectName, k, bcName, buildType);
} }
ProjectExplorer::BuildSystem *MesonBuildConfiguration::buildSystem() const ProjectExplorer::BuildSystem *MesonBuildConfiguration::buildSystem() const

6
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -604,8 +604,7 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
const QString &projectName, const QString &projectName,
const Kit *kit, const Kit *kit,
const QString &bcName, const QString &bcName,
BuildType buildType, BuildType buildType)
SpaceHandling spaceHandling)
{ {
MacroExpander exp; MacroExpander exp;
@@ -644,8 +643,7 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
qCDebug(bcLog) << "build dir template:" << buildDir; qCDebug(bcLog) << "build dir template:" << buildDir;
buildDir = exp.expand(buildDir); buildDir = exp.expand(buildDir);
qCDebug(bcLog) << "expanded build:" << buildDir; qCDebug(bcLog) << "expanded build:" << buildDir;
if (spaceHandling == ReplaceSpaces) buildDir.replace(" ", "-");
buildDir.replace(" ", "-");
return projectDir.resolvePath(buildDir); return projectDir.resolvePath(buildDir);
} }

4
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -110,14 +110,12 @@ public:
static QString buildTypeName(BuildType type); static QString buildTypeName(BuildType type);
enum SpaceHandling { KeepSpace, ReplaceSpaces };
static Utils::FilePath buildDirectoryFromTemplate(const Utils::FilePath &projectDir, static Utils::FilePath buildDirectoryFromTemplate(const Utils::FilePath &projectDir,
const Utils::FilePath &mainFilePath, const Utils::FilePath &mainFilePath,
const QString &projectName, const QString &projectName,
const Kit *kit, const Kit *kit,
const QString &bcName, const QString &bcName,
BuildType buildType, BuildType buildType);
SpaceHandling spaceHandling = ReplaceSpaces);
bool isActive() const; bool isActive() const;