From 396c6c92f2c30ca4173334b3443cb2bb7a6350e1 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 20 Jul 2023 23:24:49 +0200
Subject: [PATCH] RemoteLinux: Make generic wizard similar to QnxDeviceWizard

Change-Id: Ia8feb1b5d18d7a1cebd14f37775a6097b1dc380c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 .../genericlinuxdeviceconfigurationwizard.cpp | 23 +++++++++----------
 .../genericlinuxdeviceconfigurationwizard.h   |  2 +-
 src/plugins/remotelinux/linuxdevice.cpp       |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index 7bd047a590e..48e61ca4670 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -8,6 +8,8 @@
 #include "remotelinux_constants.h"
 #include "remotelinuxtr.h"
 
+#include <coreplugin/icore.h>
+
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
 
@@ -17,33 +19,30 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 namespace Internal {
-enum PageId { SetupPageId, KeyDeploymentPageId, FinalPageId };
 
 class GenericLinuxDeviceConfigurationWizardPrivate
 {
 public:
-    GenericLinuxDeviceConfigurationWizardPrivate(QWidget *parent)
-        : setupPage(parent), keyDeploymentPage(parent), finalPage(parent)
-    {
-    }
-
     GenericLinuxDeviceConfigurationWizardSetupPage setupPage;
     GenericLinuxDeviceConfigurationWizardKeyDeploymentPage keyDeploymentPage;
     GenericLinuxDeviceConfigurationWizardFinalPage finalPage;
     LinuxDevice::Ptr device;
 };
+
 } // namespace Internal
 
-GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard(QWidget *parent)
-    : Utils::Wizard(parent),
-      d(new Internal::GenericLinuxDeviceConfigurationWizardPrivate(this))
+GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard()
+    : Utils::Wizard(Core::ICore::dialogParent())
+    , d(new Internal::GenericLinuxDeviceConfigurationWizardPrivate)
 {
     setWindowTitle(Tr::tr("New Remote Linux Device Configuration Setup"));
-    setPage(Internal::SetupPageId, &d->setupPage);
-    setPage(Internal::KeyDeploymentPageId, &d->keyDeploymentPage);
-    setPage(Internal::FinalPageId, &d->finalPage);
+    addPage(&d->setupPage);
+    addPage(&d->keyDeploymentPage);
+    addPage(&d->finalPage);
     d->finalPage.setCommitPage(true);
+
     d->device = LinuxDevice::create();
+
     d->setupPage.setDevice(d->device);
     d->keyDeploymentPage.setDevice(d->device);
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
index df25a3b5861..87b27bf402e 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
@@ -16,7 +16,7 @@ class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizard : public Utils::W
     Q_OBJECT
 
 public:
-    GenericLinuxDeviceConfigurationWizard(QWidget *parent = nullptr);
+    GenericLinuxDeviceConfigurationWizard();
     ~GenericLinuxDeviceConfigurationWizard() override;
 
     ProjectExplorer::IDevicePtr device();
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 5883af8a4ae..d78a91c99a2 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1485,7 +1485,7 @@ LinuxDeviceFactory::LinuxDeviceFactory()
     setConstructionFunction(&LinuxDevice::create);
     setQuickCreationAllowed(true);
     setCreator([] {
-        GenericLinuxDeviceConfigurationWizard wizard(Core::ICore::dialogParent());
+        GenericLinuxDeviceConfigurationWizard wizard;
         if (wizard.exec() != QDialog::Accepted)
             return IDevice::Ptr();
         return wizard.device();