From d7ff76be69c0c0ac59dfb80e382e5074ffe174fd Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 24 Mar 2022 09:05:05 +0100 Subject: [PATCH] QtcProcess: Drop return value from stopProcess() It wasn't used at all. Change-Id: Ife0989c73c67b6106e61c40931f318ee7a5b062d Reviewed-by: hjk --- src/libs/utils/qtcprocess.cpp | 8 ++++---- src/libs/utils/qtcprocess.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 866bb0b13d4..ad0b72d2c55 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1030,15 +1030,15 @@ void QtcProcess::setRemoteProcessHooks(const DeviceProcessHooks &hooks) s_deviceHooks = hooks; } -bool QtcProcess::stopProcess() +void QtcProcess::stopProcess() { if (state() == QProcess::NotRunning) - return true; + return; terminate(); if (waitForFinished(300)) - return true; + return; kill(); - return waitForFinished(300); + waitForFinished(300); } static bool askToKill(const QString &command) diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 759790834cb..3a6b7a53c41 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -166,7 +166,7 @@ public: void setStdErrCallback(const std::function &callback); void setStdErrLineCallback(const std::function &callback); - bool stopProcess(); + void stopProcess(); bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr, bool showTimeOutMessageBox);