diff options
author | hjk <hjk@qt.io> | 2018-05-14 17:50:56 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-05-31 10:15:42 +0000 |
commit | f44e73b858af7d67b9c855469bee71927ba3f86b (patch) | |
tree | 7156c74edf440aaa2d9b9f778e6e5f2fd9ade04f /src/plugins/autotoolsprojectmanager | |
parent | 4feb2259d93dc666d41582ae63aa4b7499ef86a5 (diff) |
ProjectExplorer: Simplify BuildStepFactory
De-QObject-ify class, tr contexts are now the product's
context, which was the case in some BuildStepFactories already,
and is current state in {Run,DeployConfiguration}Factory.
One spurious object name removed.
De-virtualize canHandle(), it was never overloaded and is not
intended to be overloaded anymore.
Remove unused clone() function.
Change-Id: Iff7fba5f707505f868f94458084a18650535fa23
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
8 files changed, 3 insertions, 12 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index 0106a435b8..3bcb90d052 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -56,7 +56,7 @@ const char AUTOGEN_STEP_ID[] = "AutotoolsProjectManager.AutogenStep"; AutogenStepFactory::AutogenStepFactory() { registerStep<AutogenStep>(AUTOGEN_STEP_ID); - setDisplayName(tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id.")); + setDisplayName(AutogenStep::tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id.")); setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); } diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index 320c0bacaf..a4659ebcbc 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/src/plugins/autotoolsprojectmanager/autogenstep.h @@ -50,8 +50,6 @@ class AutogenStepConfigWidget; */ class AutogenStepFactory : public ProjectExplorer::BuildStepFactory { - Q_OBJECT - public: AutogenStepFactory(); }; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 473e587d78..51e2e34751 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -55,7 +55,7 @@ const char AUTORECONF_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.Auto AutoreconfStepFactory::AutoreconfStepFactory() { registerStep<AutoreconfStep>(AUTORECONF_STEP_ID); - setDisplayName(tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id.")); + setDisplayName(AutoreconfStep::tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id.")); setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); } diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 160f6fc5c1..7aa345c148 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h @@ -49,8 +49,6 @@ class AutoreconfStep; */ class AutoreconfStepFactory : public ProjectExplorer::BuildStepFactory { - Q_OBJECT - public: AutoreconfStepFactory(); }; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 7d370e2ded..5ae119553d 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -70,7 +70,7 @@ static QString projectDirRelativeToBuildDir(BuildConfiguration *bc) { ConfigureStepFactory::ConfigureStepFactory() { registerStep<ConfigureStep>(CONFIGURE_STEP_ID); - setDisplayName(tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id.")); + setDisplayName(ConfigureStep::tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id.")); setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); } diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index 2f5ce3e65e..0ab97fbae3 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/src/plugins/autotoolsprojectmanager/configurestep.h @@ -49,8 +49,6 @@ class ConfigureStepConfigWidget; */ class ConfigureStepFactory : public ProjectExplorer::BuildStepFactory { - Q_OBJECT - public: ConfigureStepFactory(); }; diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index eebef955a2..315d235c9b 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -56,7 +56,6 @@ MakeStepFactory::MakeStepFactory() } }; - setObjectName("Autotools::MakeStepFactory"); registerStep<Step>(MAKE_STEP_ID); setDisplayName(ProjectExplorer::MakeStep::defaultDisplayName()); setSupportedProjectType(AUTOTOOLS_PROJECT_ID); diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index cbc5496529..f738fd1057 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/src/plugins/autotoolsprojectmanager/makestep.h @@ -37,8 +37,6 @@ namespace Internal { /////////////////////////// class MakeStepFactory : public ProjectExplorer::BuildStepFactory { - Q_OBJECT - public: MakeStepFactory(); }; |