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

Utils: Rename SychronousProcess::terminate to stopProcess

Browse Source 
To align with QtcProcess.

Change-Id: I02e739b55ec95d5f516037de38b4f6228859809f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-06 10:13:00 +02:00
parent d825805c39
commit 771f1ef6d6
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2327,7 +2327,7 @@ void SynchronousProcess::setStdErrCallback(const std::function<void (const QStri
d->m_stdErr.outputCallback = callback; d->m_stdErr.outputCallback = callback;
} }
bool SynchronousProcess::terminate() bool SynchronousProcess::stopProcess()
{ {
return d->m_process.stopProcess(); return d->m_process.stopProcess();
} }

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

@@ -271,8 +271,7 @@ public:
void setStdOutCallback(const std::function<void(const QString &)> &callback); void setStdOutCallback(const std::function<void(const QString &)> &callback);
void setStdErrCallback(const std::function<void(const QString &)> &callback); void setStdErrCallback(const std::function<void(const QString &)> &callback);
public slots: bool stopProcess();
bool terminate();
private: private:
void slotTimeout(); void slotTimeout();

2
src/libs/utils/shellcommand.cpp
View File

@@ -393,7 +393,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const CommandLine &cmd,
{ {
SynchronousProcess process; SynchronousProcess process;
process.setExitCodeInterpreter(interpreter); process.setExitCodeInterpreter(interpreter);
connect(this, &ShellCommand::terminate, &process, &SynchronousProcess::terminate); connect(this, &ShellCommand::terminate, &process, &SynchronousProcess::stopProcess);
process.setEnvironment(processEnvironment()); process.setEnvironment(processEnvironment());
process.setTimeoutS(timeoutS); process.setTimeoutS(timeoutS);
if (d->m_codec) if (d->m_codec)

4
src/plugins/android/androidsdkmanager.cpp
View File

@@ -178,7 +178,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &fi](const QString &out) { proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &fi](const QString &out) {
int progressPercent = parseProgress(out, assertionFound); int progressPercent = parseProgress(out, assertionFound);
if (assertionFound) if (assertionFound)
proc.terminate(); proc.stopProcess();
if (progressPercent != -1) if (progressPercent != -1)
fi.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota)); fi.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota));
}); });
@@ -187,7 +187,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
}); });
if (interruptible) { if (interruptible) {
QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations, QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations,
&proc, &SynchronousProcess::terminate); &proc, &SynchronousProcess::stopProcess);
} }
SynchronousProcessResponse response = proc.run({config.sdkManagerToolPath(), newArgs}); SynchronousProcessResponse response = proc.run({config.sdkManagerToolPath(), newArgs});
if (assertionFound) { if (assertionFound) {