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

Utils: Rename QtcProcess::Result::Finished to FinishedWithSuccess

Browse Source 
To make clear that this is not just any finish.

Also change FinishedError to FinishedWithError, to create
symmetry.

Also adapt enum member description to reality.

Change-Id: I13e05391eb86fdb24e2ae660f14dfddb282e1104
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-28 13:19:38 +02:00
parent 08040e4e94
commit 0ba4338467
45 changed files with 139 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidavdmanager.cpp
View File

@@ -72,7 +72,7 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
proc.setCommand(cmd);
proc.runBlocking();
if (proc.result() == Utils::QtcProcess::Finished) {
if (proc.result() == Utils::QtcProcess::FinishedWithSuccess) {
if (output)
*output = proc.allOutput();
return true;
@@ -204,7 +204,7 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
proc.setTimeoutS(5);
proc.setCommand(command);
proc.runBlocking();
return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
}
static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)
@@ -354,7 +354,7 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
adbProc.setTimeoutS(10);
adbProc.setCommand(command);
adbProc.runBlocking();
if (adbProc.result() != QtcProcess::Finished)
if (adbProc.result() != QtcProcess::FinishedWithSuccess)
return false;
QString value = adbProc.allOutput().trimmed();
return value == "stopped";