From 1eaf44a270dbc8ed3fb6aab24c7d267510acfd84 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 9 Jan 2020 17:32:51 +0100 Subject: ProjectExplorer: De-QObject-ify BuildConfigurationFactories 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 --- src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp | 4 ++-- src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/autotoolsprojectmanager') diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index eb9b7ad930..257d547f36 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -78,13 +78,13 @@ AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory() setBuildGenerator([this](const Kit *k, const FilePath &projectPath, bool forSetup) { BuildInfo info(this); - info.typeName = tr("Build"); + info.typeName = BuildConfiguration::tr("Build"); info.buildDirectory = forSetup ? FilePath::fromString(projectPath.toFileInfo().absolutePath()) : projectPath; info.kitId = k->id(); if (forSetup) { //: The name of the build configuration created by default for a autotools project. - info.displayName = tr("Default"); + info.displayName = BuildConfiguration::tr("Default"); } return QList{info}; }); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h index 0a9671e8b8..1e6fa46fba 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h @@ -40,10 +40,8 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration AutotoolsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); }; -class AutotoolsBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory +class AutotoolsBuildConfigurationFactory final : public ProjectExplorer::BuildConfigurationFactory { - Q_OBJECT - public: AutotoolsBuildConfigurationFactory(); }; -- cgit v1.2.3