From da073e938d693f31b6bdd0d426774f427682fa4a Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 11 Oct 2024 12:59:52 +0200
Subject: [PATCH] DeviceKitAspect: Use base class convenience

Change-Id: Ib6177138b362030cbc8b686eab9a867b10217a28
Reviewed-by: hjk <hjk@qt.io>
---
 .../devicesupport/devicekitaspects.cpp        | 69 +++----------------
 .../devicesupport/devicemanagermodel.cpp      |  4 +-
 src/plugins/projectexplorer/kitaspect.cpp     |  4 ++
 3 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
index 6a673fdc8b5..99095dd7931 100644
--- a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
@@ -158,72 +158,25 @@ class DeviceKitAspectImpl final : public KitAspect
 {
 public:
     DeviceKitAspectImpl(Kit *workingCopy, const KitAspectFactory *factory)
-        : KitAspect(workingCopy, factory),
-        m_comboBox(createSubWidget<QComboBox>()),
-        m_model(new DeviceManagerModel(DeviceManager::instance()))
+        : KitAspect(workingCopy, factory)
     {
         setManagingPage(Constants::DEVICE_SETTINGS_PAGE_ID);
-        m_comboBox->setSizePolicy(QSizePolicy::Preferred,
-                                  m_comboBox->sizePolicy().verticalPolicy());
-        m_comboBox->setModel(m_model);
-        m_comboBox->setMinimumContentsLength(16); // Don't stretch too much for Kit Page
-        refresh();
-        m_comboBox->setToolTip(factory->description());
 
-        connect(m_model, &QAbstractItemModel::modelAboutToBeReset,
-                this, &DeviceKitAspectImpl::modelAboutToReset);
-        connect(m_model, &QAbstractItemModel::modelReset,
-                this, &DeviceKitAspectImpl::modelReset);
-        connect(m_comboBox, &QComboBox::currentIndexChanged,
-                this, &DeviceKitAspectImpl::currentDeviceChanged);
-    }
+        const auto model = new DeviceManagerModel(DeviceManager::instance(), this);
+        auto getter = [](const Kit &k) { return DeviceKitAspect::device(&k)->id().toSetting(); };
+        auto setter = [](Kit &k, const QVariant &id) {
+            DeviceKitAspect::setDeviceId(&k, Id::fromSetting(id));
+        };
+        auto resetModel = [this, model] {
+            model->setTypeFilter(DeviceTypeKitAspect::deviceTypeId(kit()));
+        };
+        setListAspectSpec({model, std::move(getter), std::move(setter), std::move(resetModel)});
 
-    ~DeviceKitAspectImpl() override
-    {
-        delete m_comboBox;
-        delete m_model;
+        connect(model, &QAbstractItemModel::modelReset, this, &DeviceKitAspectImpl::refresh);
     }
 
 private:
-    void addToInnerLayout(Layouting::Layout &builder) override
-    {
-        addMutableAction(m_comboBox);
-        builder.addItem(m_comboBox);
-    }
-
-    void makeReadOnly() override { m_comboBox->setEnabled(false); }
-
     Id settingsPageItemToPreselect() const override { return DeviceKitAspect::deviceId(kit()); }
-
-    void refresh() override
-    {
-        m_model->setTypeFilter(DeviceTypeKitAspect::deviceTypeId(kit()));
-        m_comboBox->setCurrentIndex(m_model->indexOf(DeviceKitAspect::device(kit())));
-    }
-
-    void modelAboutToReset()
-    {
-        m_selectedId = m_model->deviceId(m_comboBox->currentIndex());
-        m_ignoreChanges.lock();
-    }
-
-    void modelReset()
-    {
-        m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId));
-        m_ignoreChanges.unlock();
-    }
-
-    void currentDeviceChanged()
-    {
-        if (m_ignoreChanges.isLocked())
-            return;
-        DeviceKitAspect::setDeviceId(kit(), m_model->deviceId(m_comboBox->currentIndex()));
-    }
-
-    Guard m_ignoreChanges;
-    QComboBox *m_comboBox;
-    DeviceManagerModel *m_model;
-    Id m_selectedId;
 };
 
 class DeviceKitAspectFactory : public KitAspectFactory
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
index 481e382f6e5..8b3b998eab0 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
@@ -4,6 +4,7 @@
 #include "devicemanagermodel.h"
 
 #include "devicemanager.h"
+#include "../kitaspect.h"
 #include "../projectexplorertr.h"
 
 #include <utils/qtcassert.h>
@@ -147,7 +148,8 @@ QVariant DeviceManagerModel::data(const QModelIndex &index, int role) const
     switch (role) {
     case Qt::DecorationRole:
         return dev->deviceStateIcon();
-    case Qt::UserRole:
+    case Qt::UserRole: // TODO: Any callers?
+    case KitAspect::IdRole:
         return dev->id().toSetting();
     case Qt::DisplayRole:
         if (d->deviceManager->defaultDevice(dev->type()) == dev)
diff --git a/src/plugins/projectexplorer/kitaspect.cpp b/src/plugins/projectexplorer/kitaspect.cpp
index 936247d780c..76b81361be1 100644
--- a/src/plugins/projectexplorer/kitaspect.cpp
+++ b/src/plugins/projectexplorer/kitaspect.cpp
@@ -178,6 +178,10 @@ void KitAspect::setListAspectSpec(ListAspectSpec &&listAspectSpec)
         m_listAspectSpec->setter(
             *kit(), m_comboBox->itemData(m_comboBox->currentIndex(), IdRole));
     });
+    connect(m_listAspectSpec->model, &QAbstractItemModel::modelAboutToBeReset,
+            this, [this] { m_ignoreChanges.lock(); });
+    connect(m_listAspectSpec->model, &QAbstractItemModel::modelReset,
+            this, [this] { m_ignoreChanges.unlock(); });
 }
 
 void KitAspect::addToLayoutImpl(Layouting::Layout &layout)