From 66f6b4c32ea368345c06e3ffa6feeca007aca257 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 1 Feb 2024 18:31:24 +0100 Subject: [PATCH] ProjectExplorer: Hide JsonWizardFactoryJsExtension in .cpp Change-Id: Ia540ce9f053b218e6986cc568cb287c98707d39d Reviewed-by: Jarek Kobus --- .../jsonwizard/jsonwizardfactory.cpp | 57 ++++++++++++------- .../jsonwizard/jsonwizardfactory.h | 19 ------- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index c8299be8e85..0febbcd4149 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -80,6 +80,39 @@ static QList &generatorFactories() return theGeneratorFactories; } +namespace Internal { + +class JsonWizardFactoryJsExtension final : public QObject +{ + Q_OBJECT + +public: + JsonWizardFactoryJsExtension(Id platformId, + const QSet &availableFeatures, + const QSet &pluginFeatures) + : m_platformId(platformId) + , m_availableFeatures(availableFeatures) + , m_pluginFeatures(pluginFeatures) + {} + + Q_INVOKABLE QVariant value(const QString &name) const + { + if (name == "Platform") + return m_platformId.toString(); + if (name == "Features") + return Id::toStringList(m_availableFeatures); + if (name == "Plugins") + return Id::toStringList(m_pluginFeatures); + return {}; + } + +private: + Id m_platformId; + QSet m_availableFeatures; + QSet m_pluginFeatures; +}; + +} // namespace Internal int JsonWizardFactory::m_verbose = 0; @@ -870,26 +903,6 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const FilePath &base return errorMessage->isEmpty(); } -namespace Internal { - -JsonWizardFactoryJsExtension::JsonWizardFactoryJsExtension(Id platformId, - const QSet &availableFeatures, - const QSet &pluginFeatures) - : m_platformId(platformId) - , m_availableFeatures(availableFeatures) - , m_pluginFeatures(pluginFeatures) -{} - -QVariant JsonWizardFactoryJsExtension::value(const QString &name) const -{ - if (name == "Platform") - return m_platformId.toString(); - if (name == "Features") - return Id::toStringList(m_availableFeatures); - if (name == "Plugins") - return Id::toStringList(m_pluginFeatures); - return {}; -} - -} // namespace Internal } // namespace ProjectExplorer + +#include "jsonwizardfactory.moc" diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index c72808db66b..ea8e2e24b9e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -95,23 +95,4 @@ private: friend class ProjectExplorerPluginPrivate; }; -namespace Internal { - -class JsonWizardFactoryJsExtension : public QObject -{ - Q_OBJECT -public: - JsonWizardFactoryJsExtension(Utils::Id platformId, - const QSet &availableFeatures, - const QSet &pluginFeatures); - - Q_INVOKABLE QVariant value(const QString &name) const; - -private: - Utils::Id m_platformId; - QSet m_availableFeatures; - QSet m_pluginFeatures; -}; - -} // namespace Internal } // namespace ProjectExplorer