From d5ff8b1c241e33255b285e8d2e0cfa4baa613cd5 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 2 Jun 2021 16:21:54 +0200
Subject: [PATCH] Remove some redundant uses of QtcProcess::exitCode

Change-Id: I0dd60ec9c8774fe2ec667695ee57644d2d6cf1d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/utils/archive.cpp                    | 3 +--
 src/plugins/projectexplorer/msvctoolchain.cpp | 6 +++---
 src/plugins/qnx/qnxutils.cpp                  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp
index cf1ce2e2b11..37a2cadfdfe 100644
--- a/src/libs/utils/archive.cpp
+++ b/src/libs/utils/archive.cpp
@@ -227,8 +227,7 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest)
         [archive](int, QProcess::ExitStatus) {
             if (!archive->m_process)
                 return;
-            archive->finished(archive->m_process->exitStatus() == QProcess::NormalExit
-                              && archive->m_process->exitCode() == 0);
+            archive->finished(archive->m_process->result() == QtcProcess::FinishedWithSuccess);
             archive->m_process->deleteLater();
             archive->m_process = nullptr;
             archive->deleteLater();
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index ad2e3b516da..59952aca8de 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -630,7 +630,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
     arguments << toProcess << QLatin1String("/EP") << saver.filePath().toUserOutput();
     cpp.setCommand({binary, arguments});
     cpp.runBlocking();
-    if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0)
+    if (cpp.result() != QtcProcess::FinishedWithSuccess)
         return predefinedMacros;
 
     const QStringList output = Utils::filtered(cpp.stdOut().split('\n'),
@@ -1506,7 +1506,7 @@ static QVersionNumber clangClVersion(const QString &clangClPath)
     SynchronousProcess clangClProcess;
     clangClProcess.setCommand({clangClPath, {"--version"}});
     clangClProcess.runBlocking();
-    if (clangClProcess.result() != QtcProcess::FinishedWithSuccess || clangClProcess.exitCode() != 0)
+    if (clangClProcess.result() != QtcProcess::FinishedWithSuccess)
         return {};
     const QRegularExpressionMatch match = QRegularExpression(
                                               QStringLiteral("clang version (\\d+(\\.\\d+)+)"))
@@ -1732,7 +1732,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
     arguments.append("-");
     cpp.setCommand({compilerCommand(), arguments});
     cpp.runBlocking();
-    if (cpp.result() != Utils::QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) {
+    if (cpp.result() != Utils::QtcProcess::FinishedWithSuccess) {
         // Show the warning but still parse the output.
         QTC_CHECK(false && "clang-cl exited with non-zero code.");
     }
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index a09e6ee0f11..c0cc40625a3 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -123,7 +123,7 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName)
         return items;
     }
 
-    if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0)
+    if (process.result() != QtcProcess::FinishedWithSuccess)
         return items;
 
     // parsing process output