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

ProjectExplorer: De-QObject-ify BuildConfigurationFactories

Browse Source 
The QObject was not heavily used. Object name was for debugging only,
translation context can be taken from the corresponding BuildConfiguration
objects, the qobject_casts in the three big importers are replaced by
dynamic_cast, which is good enough in that context.

Take the opportunity to re-use translations from base BuildConfiguration
for the common cases and sprinkle in some 'final'.

Change-Id: I8e9727c98c6e943cb333556861c24e701c2bdf45
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-01-09 17:32:51 +01:00
parent 675c414b07
commit 1eaf44a270
20 changed files with 45 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,27 +467,27 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
switch (buildType) {
case BuildTypeNone:
info.typeName = "Build";
info.displayName = tr("Build");
info.displayName = BuildConfiguration::tr("Build");
info.buildType = BuildConfiguration::Unknown;
break;
case BuildTypeDebug:
info.typeName = "Debug";
info.displayName = tr("Debug");
info.displayName = BuildConfiguration::tr("Debug");
info.buildType = BuildConfiguration::Debug;
break;
case BuildTypeRelease:
info.typeName = "Release";
info.displayName = tr("Release");
info.displayName = BuildConfiguration::tr("Release");
info.buildType = BuildConfiguration::Release;
break;
case BuildTypeMinSizeRel:
info.typeName = "MinSizeRel";
info.displayName = tr("Minimum Size Release");
info.displayName = CMakeBuildConfiguration::tr("Minimum Size Release");
info.buildType = BuildConfiguration::Release;
break;
case BuildTypeRelWithDebInfo:
info.typeName = "RelWithDebInfo";
info.displayName = tr("Release with Debug Information");
info.displayName = CMakeBuildConfiguration::tr("Release with Debug Information");
info.buildType = BuildConfiguration::Profile;
break;
default:

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -109,10 +109,8 @@ private:
class CMakeProjectImporter;
class CMakeBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
class CMakeBuildConfigurationFactory final : public ProjectExplorer::BuildConfigurationFactory
{
Q_OBJECT
public:
CMakeBuildConfigurationFactory();

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

@@ -338,7 +338,7 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
const QList<BuildInfo> CMakeProjectImporter::buildInfoListForKit(const Kit *k, void *directoryData) const
{
auto data = static_cast<const DirectoryData *>(directoryData);
auto factory = qobject_cast<CMakeBuildConfigurationFactory *>(
auto factory = dynamic_cast<CMakeBuildConfigurationFactory *>(
BuildConfigurationFactory::find(k, projectFilePath()));
if (!factory)
return {};