From 822e2a224a283581b38948d4626f873c6b38c044 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 22 Nov 2022 10:45:51 +0100 Subject: [PATCH] KillAppService: Some cleanup Remove undefined and unused handleStdErr() and handleProcessFinished() methods. Remove cleanup() and finishDeployment() methods and move the implementation into stopDeployment(). Change-Id: I983e4513c4bcba45638eb054b389783ec4f73367 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/killappstep.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/plugins/remotelinux/killappstep.cpp b/src/plugins/remotelinux/killappstep.cpp index b45ab998903..7c8aa6b0b7b 100644 --- a/src/plugins/remotelinux/killappstep.cpp +++ b/src/plugins/remotelinux/killappstep.cpp @@ -26,17 +26,12 @@ public: void setRemoteExecutable(const FilePath &filePath); private: - void handleStdErr(); - void handleProcessFinished(); - bool isDeploymentNecessary() const override; void doDeploy() override; void stopDeployment() override; void handleSignalOpFinished(const QString &errorMessage); - void cleanup(); - void finishDeployment(); FilePath m_remoteExecutable; DeviceProcessSignalOperation::Ptr m_signalOperation; @@ -66,32 +61,22 @@ void KillAppService::doDeploy() m_signalOperation->killProcess(m_remoteExecutable.path()); } -void KillAppService::cleanup() +void KillAppService::stopDeployment() { if (m_signalOperation) { disconnect(m_signalOperation.data(), nullptr, this, nullptr); m_signalOperation.clear(); } -} - -void KillAppService::finishDeployment() -{ - cleanup(); handleDeploymentDone(); } -void KillAppService::stopDeployment() -{ - finishDeployment(); -} - void KillAppService::handleSignalOpFinished(const QString &errorMessage) { if (errorMessage.isEmpty()) emit progressMessage(Tr::tr("Remote application killed.")); else emit progressMessage(Tr::tr("Failed to kill remote application. Assuming it was not running.")); - finishDeployment(); + stopDeployment(); } class KillAppStep : public AbstractRemoteLinuxDeployStep