From 98d9ad8b3cfd70556c3935463d079e57c5e43e55 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 10 May 2023 14:04:03 +0200
Subject: [PATCH] Docker: Use PagedSettings

More compact.

Change-Id: Ic21c6ea9e7faf67e5f507f336f18e1134b371a97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/docker/dockerplugin.cpp   |  1 -
 src/plugins/docker/dockersettings.cpp | 44 ++++++++++++---------------
 src/plugins/docker/dockersettings.h   | 10 +-----
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/src/plugins/docker/dockerplugin.cpp b/src/plugins/docker/dockerplugin.cpp
index d7addc894df..cd2dd623bc8 100644
--- a/src/plugins/docker/dockerplugin.cpp
+++ b/src/plugins/docker/dockerplugin.cpp
@@ -28,7 +28,6 @@ public:
 
     DockerSettings m_settings;
     DockerDeviceFactory m_deviceFactory{&m_settings};
-    DockerSettingsPage m_settingPage{&m_settings};
     DockerApi m_dockerApi{&m_settings};
 };
 
diff --git a/src/plugins/docker/dockersettings.cpp b/src/plugins/docker/dockersettings.cpp
index 60e9ec4ff2a..2a60dacb7da 100644
--- a/src/plugins/docker/dockersettings.cpp
+++ b/src/plugins/docker/dockersettings.cpp
@@ -23,6 +23,25 @@ DockerSettings::DockerSettings()
     setSettingsGroup(Constants::DOCKER);
     setAutoApply(false);
 
+    setId(Docker::Constants::DOCKER_SETTINGS_ID);
+    setDisplayName(Tr::tr("Docker"));
+    setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
+    setSettings(this);
+
+    setLayouter([this](QWidget *widget) {
+        using namespace Layouting;
+
+        // clang-format off
+        Column {
+            Group {
+                title(Tr::tr("Configuration")),
+                Row { dockerBinaryPath }
+            },
+            st
+        }.attachTo(widget);
+        // clang-format on
+    });
+
     FilePaths additionalPaths;
     if (HostOsInfo::isWindowsHost())
         additionalPaths.append("C:/Program Files/Docker/Docker/resources/bin");
@@ -42,29 +61,4 @@ DockerSettings::DockerSettings()
     readSettings(Core::ICore::settings());
 }
 
-// DockerSettingsPage
-
-DockerSettingsPage::DockerSettingsPage(DockerSettings *settings)
-{
-    setId(Docker::Constants::DOCKER_SETTINGS_ID);
-    setDisplayName(Tr::tr("Docker"));
-    setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
-    setSettings(settings);
-
-    setLayouter([settings](QWidget *widget) {
-        DockerSettings &s = *settings;
-        using namespace Layouting;
-
-        // clang-format off
-        Column {
-            Group {
-                title(Tr::tr("Configuration")),
-                Row { s.dockerBinaryPath }
-            },
-            st
-        }.attachTo(widget);
-        // clang-format on
-    });
-}
-
 } // Docker::Internal
diff --git a/src/plugins/docker/dockersettings.h b/src/plugins/docker/dockersettings.h
index 4980a0a6b04..e6f8f1ec1fb 100644
--- a/src/plugins/docker/dockersettings.h
+++ b/src/plugins/docker/dockersettings.h
@@ -5,11 +5,9 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <utils/aspects.h>
-
 namespace Docker::Internal {
 
-class DockerSettings final : public Utils::AspectContainer
+class DockerSettings final : public Core::PagedSettings
 {
 public:
     DockerSettings();
@@ -17,10 +15,4 @@ public:
     Utils::StringAspect dockerBinaryPath;
 };
 
-class DockerSettingsPage final : public Core::IOptionsPage
-{
-public:
-    explicit DockerSettingsPage(DockerSettings *settings);
-};
-
 } // Docker::Internal