From fdfbf273a22b97ced0ffe307371e3e84ae17cd47 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 10 Jul 2024 11:52:27 +0200
Subject: [PATCH] BareMetal: Use LayoutBuilder for
 DebugServerProvidersSettingsWidget

Change-Id: I66ec71567de0fc9ace233c1fe3dee5c088956acf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 .../debugserverproviderssettingspage.cpp      | 40 +++++++------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
index 5c7a1cda51d..2e5542322f1 100644
--- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp
+++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
@@ -15,21 +15,18 @@
 
 #include <utils/algorithm.h>
 #include <utils/detailswidget.h>
+#include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
 #include <QAction>
 #include <QApplication>
-#include <QGroupBox>
-#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QItemSelectionModel>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSpacerItem>
 #include <QTextStream>
 #include <QTreeView>
-#include <QVBoxLayout>
 
 using namespace Debugger;
 using namespace Utils;
@@ -290,28 +287,19 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget()
     m_container->setMinimumWidth(500);
     m_container->setVisible(false);
 
-    const auto buttonLayout = new QHBoxLayout;
-    buttonLayout->setSpacing(6);
-    buttonLayout->setContentsMargins(0, 0, 0, 0);
-    buttonLayout->addWidget(m_addButton);
-    buttonLayout->addWidget(m_cloneButton);
-    buttonLayout->addWidget(m_delButton);
-    const auto spacerItem = new QSpacerItem(40, 10, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    buttonLayout->addItem(spacerItem);
-
-    const auto verticalLayout = new QVBoxLayout;
-    verticalLayout->addWidget(m_providerView);
-    verticalLayout->addLayout(buttonLayout);
-
-    const auto horizontalLayout = new QHBoxLayout;
-    horizontalLayout->addLayout(verticalLayout);
-    horizontalLayout->addWidget(m_container);
-
-    const auto groupBox = new QGroupBox(Tr::tr("Debug Server Providers"), this);
-    groupBox->setLayout(horizontalLayout);
-
-    const auto topLayout = new QVBoxLayout(this);
-    topLayout->addWidget(groupBox);
+    using namespace Layouting;
+    Column {
+        Group {
+            title(Tr::tr("Debug Server Providers")),
+            Row {
+                Column {
+                    m_providerView,
+                    Row { m_addButton, m_cloneButton, m_delButton, st },
+                },
+                m_container,
+            },
+        },
+    }.attachTo(this);
 
     connect(&m_model, &DebugServerProviderModel::providerStateChanged,
             this, &DebugServerProvidersSettingsWidget::updateState);