From 36707dc90e351844f4d45d37c57a1bd0a6f2f752 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 18 Aug 2023 14:50:58 +0200
Subject: [PATCH] QbsProjectManager: Hide QbsKitAspectFactory implementation

Change-Id: Ifbea98759283ea5017eb28ee4e0aec56cf1c5470
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../qbsprojectmanager/qbskitinformation.cpp   | 50 ++++++++++---------
 .../qbsprojectmanager/qbskitinformation.h     | 17 +------
 .../qbsprojectmanagerplugin.cpp               |  2 -
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.cpp b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
index 84ad6d34a47..d944fb5ade1 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
@@ -17,8 +17,7 @@
 
 using namespace ProjectExplorer;
 
-namespace QbsProjectManager {
-namespace Internal {
+namespace QbsProjectManager::Internal {
 
 class QbsKitAspectImpl final : public KitAspect
 {
@@ -53,14 +52,6 @@ private:
     QPushButton * const m_changeButton;
 };
 
-QbsKitAspectFactory::QbsKitAspectFactory()
-{
-    setObjectName(QLatin1String("QbsKitAspect"));
-    setId(QbsKitAspect::id());
-    setDisplayName(Tr::tr("Additional Qbs Profile Settings"));
-    setPriority(22000);
-}
-
 QString QbsKitAspect::representation(const Kit *kit)
 {
     const QVariantMap props = properties(kit);
@@ -90,20 +81,33 @@ Utils::Id QbsKitAspect::id()
     return "Qbs.KitInformation";
 }
 
-Tasks QbsKitAspectFactory::validate(const Kit *) const
-{
-    return {};
-}
+// QbsKitAspectFactory
 
-KitAspectFactory::ItemList QbsKitAspectFactory::toUserOutput(const Kit *k) const
+class QbsKitAspectFactory final : public KitAspectFactory
 {
-    return {{displayName(), QbsKitAspect::representation(k)}};
-}
+public:
+    QbsKitAspectFactory()
+    {
+        setObjectName(QLatin1String("QbsKitAspect"));
+        setId(QbsKitAspect::id());
+        setDisplayName(Tr::tr("Additional Qbs Profile Settings"));
+        setPriority(22000);
+    }
 
-KitAspect *QbsKitAspectFactory::createKitAspect(Kit *k) const
-{
-    return new QbsKitAspectImpl(k, this);
-}
+private:
+    Tasks validate(const Kit *) const override { return {}; }
 
-} // namespace Internal
-} // namespace QbsProjectManager
+    ItemList toUserOutput(const Kit *k) const override
+    {
+        return {{displayName(), QbsKitAspect::representation(k)}};
+    }
+
+    KitAspect *createKitAspect(Kit *k) const override
+    {
+        return new QbsKitAspectImpl(k, this);
+    }
+};
+
+const QbsKitAspectFactory theQbsKitAspectFactory;
+
+} // QbsProjectManager::Internal
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.h b/src/plugins/qbsprojectmanager/qbskitinformation.h
index f454ed3a387..2ee4c60f42e 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.h
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.h
@@ -5,8 +5,7 @@
 
 #include <projectexplorer/kitaspects.h>
 
-namespace QbsProjectManager {
-namespace Internal {
+namespace QbsProjectManager::Internal {
 
 class QbsKitAspect final
 {
@@ -18,16 +17,4 @@ public:
     static Utils::Id id();
 };
 
-class QbsKitAspectFactory final : public ProjectExplorer::KitAspectFactory
-{
-public:
-    QbsKitAspectFactory();
-
-private:
-    ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
-    ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
-    ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *) const override;
-};
-
-} // namespace Internal
-} // namespace QbsProjectManager
+} // QbsProjectManager::Internal
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 0f4a08aad11..4299f22e293 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -7,7 +7,6 @@
 #include "qbsbuildstep.h"
 #include "qbscleanstep.h"
 #include "qbsinstallstep.h"
-#include "qbskitinformation.h"
 #include "qbsnodes.h"
 #include "qbsprofilemanager.h"
 #include "qbsprofilessettingspage.h"
@@ -74,7 +73,6 @@ public:
     QbsInstallStepFactory installStepFactory;
     QbsSettingsPage settingsPage;
     QbsProfilesSettingsPage profilesSetttingsPage;
-    QbsKitAspectFactory qbsKitAspectFactory;
 };
 
 QbsProjectManagerPlugin::~QbsProjectManagerPlugin()