From d171e6da69133856f125d007b10f0dd5908103a6 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 11 Jul 2023 05:53:34 +0200
Subject: [PATCH] AbstractRemoteLinuxDeployStep: Make some overrides final

Move some methods into protected section.
Do some cleanup.

Change-Id: Ica6f6fd181334c450666049c10d9ecc1ea16ea5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../remotelinux/abstractremotelinuxdeploystep.cpp  |  5 +----
 .../remotelinux/abstractremotelinuxdeploystep.h    | 14 +++++---------
 src/plugins/remotelinux/rsyncdeploystep.cpp        |  3 +--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 8eac07557f7..c97f9bc25e3 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -9,15 +9,12 @@
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
 
 #include <solutions/tasking/tasktree.h>
 
 #include <utils/qtcassert.h>
 
 #include <QDateTime>
-#include <QPointer>
 
 using namespace ProjectExplorer;
 using namespace Tasking;
@@ -55,7 +52,7 @@ IDevice::ConstPtr AbstractRemoteLinuxDeployStep::deviceConfiguration() const
 }
 
 void AbstractRemoteLinuxDeployStep::saveDeploymentTimeStamp(const DeployableFile &deployableFile,
-                                                               const QDateTime &remoteTimestamp)
+                                                            const QDateTime &remoteTimestamp)
 {
     d->deployTimes.saveDeploymentTimeStamp(deployableFile, kit(), remoteTimestamp);
 }
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index d9674686272..299a3ca736a 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -8,8 +8,6 @@
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/devicesupport/idevicefwd.h>
 
-#include <QObject>
-
 namespace ProjectExplorer { class DeployableFile; }
 namespace Tasking { class GroupItem; }
 
@@ -23,19 +21,17 @@ public:
     explicit AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ~AbstractRemoteLinuxDeployStep() override;
 
+protected:
     ProjectExplorer::IDeviceConstPtr deviceConfiguration() const;
-
     virtual Utils::expected_str<void> isDeploymentPossible() const;
-
     void handleStdOutData(const QString &data);
     void handleStdErrData(const QString &data);
 
-protected:
-    bool fromMap(const QVariantMap &map) override;
-    QVariantMap toMap() const override;
-    bool init() override;
+    bool fromMap(const QVariantMap &map) final;
+    QVariantMap toMap() const final;
+    bool init() final;
     void doRun() final;
-    void doCancel() override;
+    void doCancel() final;
 
     void setInternalInitializer(const std::function<Utils::expected_str<void>()> &init);
 
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index 683e5335d7d..ae496279094 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -176,8 +176,7 @@ GroupItem RsyncDeployStep::transferTask()
 
         transfer.setRsyncFlags(flags());
         transfer.setFilesToTransfer(m_files);
-        connect(&transfer, &FileTransfer::progress,
-                this, &AbstractRemoteLinuxDeployStep::handleStdOutData);
+        connect(&transfer, &FileTransfer::progress, this, &RsyncDeployStep::handleStdOutData);
     };
     const auto errorHandler = [this](const FileTransfer &transfer) {
         const ProcessResultData result = transfer.resultData();