From 00d26f4e8e98f54381a12fb5bd5617853ec6b941 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 22 Jul 2024 10:13:01 +0200
Subject: [PATCH] Meson: Rename ToolKitAspectWidget -> MesonToolKitAspectImpl

Following the (changed) global naming scheme.

Change-Id: If98d644b52013af4f973540cd56d1186d3656e52
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .../mesontoolkitaspect.cpp                    |  2 +-
 .../ninjatoolkitaspect.cpp                    |  2 +-
 .../toolkitaspectwidget.cpp                   | 38 +++++++++----------
 .../mesonprojectmanager/toolkitaspectwidget.h | 12 +++---
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
index 73d4f47b081..9cf7541c3a0 100644
--- a/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
@@ -65,7 +65,7 @@ public:
 
     KitAspect *createKitAspect(Kit *k) const override
     {
-        return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Meson};
+        return new MesonToolKitAspectImpl{k, this, MesonToolKitAspectImpl::ToolType::Meson};
     }
 
     ItemList toUserOutput(const Kit *k) const override
diff --git a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
index 49c87017444..629fd1b4839 100644
--- a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
@@ -74,7 +74,7 @@ public:
 
     KitAspect *createKitAspect(Kit *k) const final
     {
-        return new ToolKitAspectWidget(k, this, ToolKitAspectWidget::ToolType::Ninja);
+        return new MesonToolKitAspectImpl(k, this, MesonToolKitAspectImpl::ToolType::Ninja);
     }
 };
 
diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
index 8bd5f7072e7..10629b0798b 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
@@ -9,13 +9,14 @@
 
 #include <utils/qtcassert.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+using namespace ProjectExplorer;
 
-ToolKitAspectWidget::ToolKitAspectWidget(ProjectExplorer::Kit *kit,
-                                         const ProjectExplorer::KitAspectFactory *factory,
-                                         ToolType type)
-    : ProjectExplorer::KitAspect(kit, factory)
+namespace MesonProjectManager::Internal {
+
+MesonToolKitAspectImpl::MesonToolKitAspectImpl(Kit *kit,
+                                               const KitAspectFactory *factory,
+                                               ToolType type)
+    : KitAspect(kit, factory)
     , m_toolsComboBox(createSubWidget<QComboBox>())
     , m_type{type}
 {
@@ -28,26 +29,26 @@ ToolKitAspectWidget::ToolKitAspectWidget(ProjectExplorer::Kit *kit,
     loadTools();
 
     connect(MesonTools::instance(), &MesonTools::toolAdded,
-            this, &ToolKitAspectWidget::addTool);
+            this, &MesonToolKitAspectImpl::addTool);
     connect(MesonTools::instance(), &MesonTools::toolRemoved,
-            this, &ToolKitAspectWidget::removeTool);
+            this, &MesonToolKitAspectImpl::removeTool);
     connect(m_toolsComboBox, &QComboBox::currentIndexChanged,
-            this, &ToolKitAspectWidget::setCurrentToolIndex);
+            this, &MesonToolKitAspectImpl::setCurrentToolIndex);
 }
 
-ToolKitAspectWidget::~ToolKitAspectWidget()
+MesonToolKitAspectImpl::~MesonToolKitAspectImpl()
 {
     delete m_toolsComboBox;
 }
 
-void ToolKitAspectWidget::addTool(const MesonTools::Tool_t &tool)
+void MesonToolKitAspectImpl::addTool(const MesonTools::Tool_t &tool)
 {
     QTC_ASSERT(tool, return );
     if (isCompatible(tool))
         this->m_toolsComboBox->addItem(tool->name(), tool->id().toSetting());
 }
 
-void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
+void MesonToolKitAspectImpl::removeTool(const MesonTools::Tool_t &tool)
 {
     QTC_ASSERT(tool, return );
     if (!isCompatible(tool))
@@ -59,7 +60,7 @@ void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
     m_toolsComboBox->removeItem(index);
 }
 
-void ToolKitAspectWidget::setCurrentToolIndex(int index)
+void MesonToolKitAspectImpl::setCurrentToolIndex(int index)
 {
     if (m_toolsComboBox->count() == 0)
         return;
@@ -70,7 +71,7 @@ void ToolKitAspectWidget::setCurrentToolIndex(int index)
         NinjaToolKitAspect::setNinjaTool(m_kit, id);
 }
 
-int ToolKitAspectWidget::indexOf(const Utils::Id &id)
+int MesonToolKitAspectImpl::indexOf(const Utils::Id &id)
 {
     for (int i = 0; i < m_toolsComboBox->count(); ++i) {
         if (id == Utils::Id::fromSetting(m_toolsComboBox->itemData(i)))
@@ -79,13 +80,13 @@ int ToolKitAspectWidget::indexOf(const Utils::Id &id)
     return -1;
 }
 
-bool ToolKitAspectWidget::isCompatible(const MesonTools::Tool_t &tool)
+bool MesonToolKitAspectImpl::isCompatible(const MesonTools::Tool_t &tool)
 {
     return (m_type == ToolType::Meson && MesonTools::isMesonWrapper(tool))
            || (m_type == ToolType::Ninja && MesonTools::isNinjaWrapper(tool));
 }
 
-void ToolKitAspectWidget::loadTools()
+void MesonToolKitAspectImpl::loadTools()
 {
     for (const MesonTools::Tool_t &tool : MesonTools::tools()) {
         addTool(tool);
@@ -94,7 +95,7 @@ void ToolKitAspectWidget::loadTools()
     m_toolsComboBox->setEnabled(m_toolsComboBox->count());
 }
 
-void ToolKitAspectWidget::setToDefault()
+void MesonToolKitAspectImpl::setToDefault()
 {
     const MesonTools::Tool_t autoDetected = [this] {
         if (m_type == ToolType::Meson)
@@ -112,5 +113,4 @@ void ToolKitAspectWidget::setToDefault()
     }
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index 48928a8ffd8..dff96aadc99 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -12,18 +12,17 @@
 #include <QComboBox>
 #include <QCoreApplication>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
-class ToolKitAspectWidget final : public ProjectExplorer::KitAspect
+class MesonToolKitAspectImpl final : public ProjectExplorer::KitAspect
 {
 public:
     enum class ToolType { Meson, Ninja };
 
-    ToolKitAspectWidget(ProjectExplorer::Kit *kit,
+    MesonToolKitAspectImpl(ProjectExplorer::Kit *kit,
                         const ProjectExplorer::KitAspectFactory *factory,
                         ToolType type);
-    ~ToolKitAspectWidget();
+    ~MesonToolKitAspectImpl();
 
 private:
     void addTool(const MesonTools::Tool_t &tool);
@@ -56,5 +55,4 @@ private:
     ToolType m_type;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // MesonProjectManager::Internal