Qmake: Rename some of the KitAspect related classes

... and split out the static interface.

Change-Id: I9767c858a850b1fe16c97acc4848e8f69ae3342e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/qmakeprojectmanager/qmakekitinformation.cpp

@@ -26,18 +26,18 @@ using namespace Utils;
 namespace QmakeProjectManager {
 namespace Internal {
 
-class QmakeKitAspectWidget final : public KitAspect
+class QmakeKitAspectImpl final : public KitAspect
 {
 public:
-    QmakeKitAspectWidget(Kit *k, const KitAspectFactory *ki)
+    QmakeKitAspectImpl(Kit *k, const KitAspectFactory *ki)
         : KitAspect(k, ki), m_lineEdit(createSubWidget<QLineEdit>())
     {
         refresh(); // set up everything according to kit
         m_lineEdit->setToolTip(ki->description());
-        connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectWidget::mkspecWasChanged);
+        connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectImpl::mkspecWasChanged);
     }
 
-    ~QmakeKitAspectWidget() override { delete m_lineEdit; }
+    ~QmakeKitAspectImpl() override { delete m_lineEdit; }
 
 private:
     void addToLayout(Layouting::LayoutItem &parent) override
@@ -65,7 +65,7 @@ private:
 };
 
 
-QmakeKitAspect::QmakeKitAspect()
+QmakeKitAspectFactory::QmakeKitAspectFactory()
 {
     setObjectName(QLatin1String("QmakeKitAspect"));
     setId(QmakeKitAspect::id());
@@ -75,7 +75,7 @@ QmakeKitAspect::QmakeKitAspect()
     setPriority(24000);
 }
 
-Tasks QmakeKitAspect::validate(const Kit *k) const
+Tasks QmakeKitAspectFactory::validate(const Kit *k) const
 {
     Tasks result;
     QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
@@ -89,21 +89,21 @@ Tasks QmakeKitAspect::validate(const Kit *k) const
     return result;
 }
 
-KitAspect *QmakeKitAspect::createKitAspect(Kit *k) const
+KitAspect *QmakeKitAspectFactory::createKitAspect(Kit *k) const
 {
-    return new Internal::QmakeKitAspectWidget(k, this);
+    return new Internal::QmakeKitAspectImpl(k, this);
 }
 
-KitAspectFactory::ItemList QmakeKitAspect::toUserOutput(const Kit *k) const
+KitAspectFactory::ItemList QmakeKitAspectFactory::toUserOutput(const Kit *k) const
 {
-    return {{Tr::tr("mkspec"), QDir::toNativeSeparators(mkspec(k))}};
+    return {{Tr::tr("mkspec"), QDir::toNativeSeparators(QmakeKitAspect::mkspec(k))}};
 }
 
-void QmakeKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
+void QmakeKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expander) const
 {
     expander->registerVariable("Qmake:mkspec", Tr::tr("Mkspec configured for qmake by the kit."),
                 [kit]() -> QString {
-                    return QDir::toNativeSeparators(mkspec(kit));
+                    return QDir::toNativeSeparators(QmakeKitAspect::mkspec(kit));
                 });
 }
 

src/plugins/qmakeprojectmanager/qmakekitinformation.h

@@ -8,21 +8,9 @@
 namespace QmakeProjectManager {
 namespace Internal {
 
-class QmakeKitAspect : public ProjectExplorer::KitAspectFactory
+class QmakeKitAspect
 {
-    Q_OBJECT
-
 public:
-    QmakeKitAspect();
-
-    ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const override;
-
-    ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *k) const override;
-
-    ItemList toUserOutput(const ProjectExplorer::Kit *k) const override;
-
-    void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
-
     static Utils::Id id();
     enum class MkspecSource { User, Code };
     static void setMkspec(ProjectExplorer::Kit *k, const QString &mkspec, MkspecSource source);
@@ -31,5 +19,21 @@ public:
     static QString defaultMkspec(const ProjectExplorer::Kit *k);
 };
 
+class QmakeKitAspectFactory : public ProjectExplorer::KitAspectFactory
+{
+    Q_OBJECT
+
+public:
+    QmakeKitAspectFactory();
+
+    ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const override;
+
+    ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *k) const override;
+
+    ItemList toUserOutput(const ProjectExplorer::Kit *k) const override;
+
+    void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
+};
+
 } // namespace Internal
 } // namespace QmakeProjectManager

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -96,7 +96,7 @@ public:
     QAction *m_addLibraryAction = nullptr;
     QAction *m_addLibraryActionContextMenu = nullptr;
 
-    QmakeKitAspect qmakeKitAspect;
+    QmakeKitAspectFactory qmakeKitAspectFactory;
 
     void addLibrary();
     void addLibraryContextMenu();