From 2dbd2fb674ff51461fffe8537d0b7d8c0c6ca7e2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 20 Jan 2025 18:43:47 +0100
Subject: [PATCH] RemoteLinux: Simplify PublicKeyDeploymentDialog

Change-Id: Iae53f4c3948176f0bc5df11d2cc24b33c113d774
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/linuxdevice.cpp           |  2 +-
 .../remotelinux/publickeydeploymentdialog.cpp     | 15 +++++++--------
 .../remotelinux/publickeydeploymentdialog.h       |  6 ++----
 src/plugins/remotelinux/sshdevicewizard.cpp       |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index c5786b2e7e7..a943185b392 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1029,7 +1029,7 @@ LinuxDevice::LinuxDevice()
     setSshParameters(sshParams);
 
     addDeviceAction({Tr::tr("Deploy Public Key..."), [](const IDevice::Ptr &device) {
-        if (auto d = Internal::PublicKeyDeploymentDialog::createDialog(device, Core::ICore::dialogParent())) {
+        if (auto d = Internal::PublicKeyDeploymentDialog::createDialog(device)) {
             d->exec();
             delete d;
         }
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index a3d78cbd1dd..18d54ea7faf 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -5,6 +5,8 @@
 
 #include "remotelinuxtr.h"
 
+#include <coreplugin/icore.h>
+
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/devicesupport/sshsettings.h>
@@ -27,8 +29,7 @@ public:
     bool m_done;
 };
 
-PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(
-        const DeviceConstRef &device, QWidget *parent) // TODO: Use Core::ICore::dialogParent()
+PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const DeviceConstRef &device)
 {
     const FilePath dir = device.sshParameters().privateKeyFile.parentDir();
     const FilePath publicKeyFileName = FileUtils::getOpenFilePath(
@@ -36,14 +37,12 @@ PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(
         Tr::tr("Public Key Files (*.pub);;All Files (*)"));
     if (publicKeyFileName.isEmpty())
         return nullptr;
-    return new PublicKeyDeploymentDialog(device, publicKeyFileName, parent);
+    return new PublicKeyDeploymentDialog(device, publicKeyFileName);
 }
 
-PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(
-        const DeviceConstRef &device,
-        const FilePath &publicKeyFileName,
-        QWidget *parent)
-    : QProgressDialog(parent), d(new PublicKeyDeploymentDialogPrivate)
+PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const DeviceConstRef &device,
+                                                     const FilePath &publicKeyFileName)
+    : QProgressDialog(Core::ICore::dialogParent()), d(new PublicKeyDeploymentDialogPrivate)
 {
     setAutoReset(false);
     setAutoClose(false);
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h
index fef4fe14a3f..d8ebf594dab 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.h
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.h
@@ -21,12 +21,10 @@ class PublicKeyDeploymentDialog : public QProgressDialog
     Q_OBJECT
 public:
     // Asks for public key and returns null if the file dialog is canceled.
-    static PublicKeyDeploymentDialog *createDialog(const ProjectExplorer::DeviceConstRef &device,
-                                                   QWidget *parent = nullptr);
+    static PublicKeyDeploymentDialog *createDialog(const ProjectExplorer::DeviceConstRef &device);
 
     PublicKeyDeploymentDialog(const ProjectExplorer::DeviceConstRef &device,
-                              const Utils::FilePath &publicKeyFileName,
-                              QWidget *parent = nullptr);
+                              const Utils::FilePath &publicKeyFileName);
 
     ~PublicKeyDeploymentDialog() override;
 
diff --git a/src/plugins/remotelinux/sshdevicewizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp
index 350a320fdbe..9b57f9644da 100644
--- a/src/plugins/remotelinux/sshdevicewizard.cpp
+++ b/src/plugins/remotelinux/sshdevicewizard.cpp
@@ -111,7 +111,7 @@ public:
         auto const deployButton = new QPushButton(Tr::tr("Deploy Public Key"), this);
         connect(deployButton, &QPushButton::clicked, this, [this] {
             Internal::PublicKeyDeploymentDialog dlg(
-                m_device, m_keyFileChooser.filePath().stringAppended(".pub"), this);
+                m_device, m_keyFileChooser.filePath().stringAppended(".pub"));
             m_iconLabel.setPixmap((dlg.exec() == QDialog::Accepted ? Icons::OK : Icons::BROKEN).pixmap());
         });
         auto const createButton = new QPushButton(Tr::tr("Create New Key Pair"), this);