From 00fea961f3a4183db56e5a0018780d57961556ab Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 18 Aug 2023 13:03:50 +0200 Subject: [PATCH] ProjectExplorer: Inline DefaultDeployConfigurationFactory Change-Id: I03750e35b99ad42945312a3eb586016677a43428 Reviewed-by: hjk --- src/plugins/projectexplorer/deployconfiguration.cpp | 12 ------------ src/plugins/projectexplorer/deployconfiguration.h | 6 ------ src/plugins/projectexplorer/projectexplorer.cpp | 12 ++++++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 03761502d6e..3b267b59bb0 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -245,16 +245,4 @@ void DeployConfigurationFactory::addInitialStep(Utils::Id stepId, const std::fun m_initialSteps.append({stepId, condition}); } -/// -// DefaultDeployConfigurationFactory -/// - -DefaultDeployConfigurationFactory::DefaultDeployConfigurationFactory() -{ - setConfigBaseId("ProjectExplorer.DefaultDeployConfiguration"); - addSupportedTargetDeviceType(Constants::DESKTOP_DEVICE_TYPE); - //: Display name of the default deploy configuration - setDefaultDisplayName(Tr::tr("Deploy Configuration")); -} - } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 9e0b40865c4..48f07d90906 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -100,10 +100,4 @@ private: PostRestore m_postRestore; }; -class DefaultDeployConfigurationFactory : public DeployConfigurationFactory -{ -public: - DefaultDeployConfigurationFactory(); -}; - } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 2f2a9644532..063196c65fd 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -426,6 +426,18 @@ private: Core::LocatorMatcherTasks matchers() final; }; +class DefaultDeployConfigurationFactory final : public DeployConfigurationFactory +{ +public: + DefaultDeployConfigurationFactory() + { + setConfigBaseId("ProjectExplorer.DefaultDeployConfiguration"); + addSupportedTargetDeviceType(Constants::DESKTOP_DEVICE_TYPE); + //: Display name of the default deploy configuration + setDefaultDisplayName(Tr::tr("Deploy Configuration")); + } +}; + class ProjectExplorerPluginPrivate : public QObject { public: