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

Remove some redundant uses of QtcProcess::exitCode

Browse Source 
Change-Id: I0dd60ec9c8774fe2ec667695ee57644d2d6cf1d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-06-02 16:21:54 +02:00
parent accb1e6e08
commit d5ff8b1c24
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/archive.cpp
View File

@@ -227,8 +227,7 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest)
[archive](int, QProcess::ExitStatus) { [archive](int, QProcess::ExitStatus) {
if (!archive->m_process) if (!archive->m_process)
return; return;
archive->finished(archive->m_process->exitStatus() == QProcess::NormalExit archive->finished(archive->m_process->result() == QtcProcess::FinishedWithSuccess);
&& archive->m_process->exitCode() == 0);
archive->m_process->deleteLater(); archive->m_process->deleteLater();
archive->m_process = nullptr; archive->m_process = nullptr;
archive->deleteLater(); archive->deleteLater();

6
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -630,7 +630,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
arguments << toProcess << QLatin1String("/EP") << saver.filePath().toUserOutput(); arguments << toProcess << QLatin1String("/EP") << saver.filePath().toUserOutput();
cpp.setCommand({binary, arguments}); cpp.setCommand({binary, arguments});
cpp.runBlocking(); cpp.runBlocking();
if (cpp.result() != QtcProcess::FinishedWithSuccess || cpp.exitCode() != 0) if (cpp.result() != QtcProcess::FinishedWithSuccess)
return predefinedMacros; return predefinedMacros;
const QStringList output = Utils::filtered(cpp.stdOut().split('\n'), const QStringList output = Utils::filtered(cpp.stdOut().split('\n'),
@@ -1506,7 +1506,7 @@ static QVersionNumber clangClVersion(const QString &clangClPath)
SynchronousProcess clangClProcess; SynchronousProcess clangClProcess;
clangClProcess.setCommand({clangClPath, {"--version"}}); clangClProcess.setCommand({clangClPath, {"--version"}});
clangClProcess.runBlocking(); clangClProcess.runBlocking();
if (clangClProcess.result() != QtcProcess::FinishedWithSuccess || clangClProcess.exitCode() != 0) if (clangClProcess.result() != QtcProcess::FinishedWithSuccess)
return {}; return {};
const QRegularExpressionMatch match = QRegularExpression( const QRegularExpressionMatch match = QRegularExpression(
QStringLiteral("clang version (\\d+(\\.\\d+)+)")) QStringLiteral("clang version (\\d+(\\.\\d+)+)"))
@@ -1732,7 +1732,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
arguments.append("-"); arguments.append("-");
cpp.setCommand({compilerCommand(), arguments}); cpp.setCommand({compilerCommand(), arguments});
cpp.runBlocking(); 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. // Show the warning but still parse the output.
QTC_CHECK(false && "clang-cl exited with non-zero code."); QTC_CHECK(false && "clang-cl exited with non-zero code.");
} }

2
src/plugins/qnx/qnxutils.cpp
View File

@@ -123,7 +123,7 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName)
return items; return items;
} }
if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) if (process.result() != QtcProcess::FinishedWithSuccess)
return items; return items;
// parsing process output // parsing process output