feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtcProcess: Drop return value from stopProcess()

Browse Source 
It wasn't used at all.

Change-Id: Ife0989c73c67b6106e61c40931f318ee7a5b062d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-03-24 09:05:05 +01:00
parent e3aad67ce5
commit d7ff76be69
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/qtcprocess.cpp
View File

@@ -1030,15 +1030,15 @@ void QtcProcess::setRemoteProcessHooks(const DeviceProcessHooks &hooks)
s_deviceHooks = hooks; s_deviceHooks = hooks;
} }
bool QtcProcess::stopProcess() void QtcProcess::stopProcess()
{ {
if (state() == QProcess::NotRunning) if (state() == QProcess::NotRunning)
return true; return;
terminate(); terminate();
if (waitForFinished(300)) if (waitForFinished(300))
return true; return;
kill(); kill();
return waitForFinished(300); waitForFinished(300);
} }
static bool askToKill(const QString &command) static bool askToKill(const QString &command)

2
src/libs/utils/qtcprocess.h
View File

@@ -166,7 +166,7 @@ public:
void setStdErrCallback(const std::function<void(const QString &)> &callback); void setStdErrCallback(const std::function<void(const QString &)> &callback);
void setStdErrLineCallback(const std::function<void(const QString &)> &callback); void setStdErrLineCallback(const std::function<void(const QString &)> &callback);
bool stopProcess(); void stopProcess();
bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr, bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr,
bool showTimeOutMessageBox); bool showTimeOutMessageBox);