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/projectexplorer/buildstep.h | |
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/projectexplorer/buildstep.h')
-rw-r--r-- | src/plugins/projectexplorer/buildstep.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index dd68e52216..d6e685735b 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -118,13 +118,11 @@ public: BuildStepCreator creator; }; -class PROJECTEXPLORER_EXPORT BuildStepFactory : public QObject +class PROJECTEXPLORER_EXPORT BuildStepFactory { - Q_OBJECT - public: BuildStepFactory(); - ~BuildStepFactory() override; + virtual ~BuildStepFactory(); static const QList<BuildStepFactory *> allBuildStepFactories(); @@ -133,9 +131,12 @@ public: BuildStep *create(BuildStepList *parent, Core::Id id); BuildStep *restore(BuildStepList *parent, const QVariantMap &map); - virtual bool canHandle(BuildStepList *bsl) const; + bool canHandle(BuildStepList *bsl) const; protected: + BuildStepFactory(const BuildStepFactory &) = delete; + BuildStepFactory &operator=(const BuildStepFactory &) = delete; + using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>; template <class BuildStepType> |