From a3ff220f5b3a9205c41c3851d187f26417ff6cb7 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 14 Feb 2022 16:03:43 +0100 Subject: [PATCH] Drop ::ExitStatus:: and ::ProcessError:: That's superfluous. Fix comparison of QProcess::exitCode with QProcess::ExitStatus. Change-Id: I49d746fdbbc279e3e04c4ed57d386560e7cbe4b4 Reviewed-by: hjk --- src/libs/utils/launcherpackets.h | 4 ++-- src/libs/utils/qtcprocess.cpp | 2 +- .../mcusupport/mcusupportversiondetection.cpp | 2 +- .../mesonprojectmanager/project/mesonprocess.cpp | 12 ++++++------ src/plugins/nim/suggest/server.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libs/utils/launcherpackets.h b/src/libs/utils/launcherpackets.h index 372290f1ca5..779636bec0c 100644 --- a/src/libs/utils/launcherpackets.h +++ b/src/libs/utils/launcherpackets.h @@ -217,8 +217,8 @@ public: QString errorString; QByteArray stdOut; QByteArray stdErr; - QProcess::ExitStatus exitStatus = QProcess::ExitStatus::NormalExit; - QProcess::ProcessError error = QProcess::ProcessError::UnknownError; + QProcess::ExitStatus exitStatus = QProcess::NormalExit; + QProcess::ProcessError error = QProcess::UnknownError; int exitCode = 0; private: diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index e277ff37602..68381992a70 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1243,7 +1243,7 @@ QProcess::ExitStatus QtcProcess::exitStatus() const { if (d->m_process) return d->m_process->exitStatus(); - return QProcess::ExitStatus::NormalExit; + return QProcess::NormalExit; } void QtcProcess::kill() diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp index 2b6b76ef825..8e1059f4290 100644 --- a/src/plugins/mcusupport/mcusupportversiondetection.cpp +++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp @@ -74,7 +74,7 @@ QString McuPackageExecutableVersionDetector::parseVersion(const QString &package if (!binaryProcess.waitForStarted()) return QString(); binaryProcess.waitForFinished(execTimeout); - if (binaryProcess.exitCode() == QProcess::ExitStatus::NormalExit) { + if (binaryProcess.exitStatus() == QProcess::NormalExit) { const QString processOutput = QString::fromUtf8( binaryProcess.readAllStandardOutput().append( binaryProcess.readAllStandardError())); diff --git a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp b/src/plugins/mesonprojectmanager/project/mesonprocess.cpp index 25b859ec730..82ec6e55e4d 100644 --- a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp +++ b/src/plugins/mesonprojectmanager/project/mesonprocess.cpp @@ -118,29 +118,29 @@ void MesonProcess::handleProcessError(QProcess::ProcessError error) QString message; QString commandStr = m_currentCommand.toUserOutput(); switch (error) { - case QProcess::ProcessError::FailedToStart: + case QProcess::FailedToStart: message = tr("The process failed to start.") + tr("Either the " "invoked program \"%1\" is missing, or you may have insufficient " "permissions to invoke the program.") .arg(m_currentCommand.executable().toUserOutput()); break; - case QProcess::ProcessError::Crashed: + case QProcess::Crashed: message = tr("The process was ended forcefully."); break; - case QProcess::ProcessError::Timedout: + case QProcess::Timedout: message = tr("Process timed out."); break; - case QProcess::ProcessError::WriteError: + case QProcess::WriteError: message = tr("An error occurred when attempting to write " "to the process. For example, the process may not be running, " "or it may have closed its input channel."); break; - case QProcess::ProcessError::ReadError: + case QProcess::ReadError: message = tr("An error occurred when attempting to read from " "the process. For example, the process may not be running."); break; - case QProcess::ProcessError::UnknownError: + case QProcess::UnknownError: message = tr("An unknown error in the process occurred."); break; } diff --git a/src/plugins/nim/suggest/server.cpp b/src/plugins/nim/suggest/server.cpp index d1eb036f022..48e29d1ceb7 100644 --- a/src/plugins/nim/suggest/server.cpp +++ b/src/plugins/nim/suggest/server.cpp @@ -108,7 +108,7 @@ void NimSuggestServer::onFinished() { clearState(); - if (m_process.exitCode() == QProcess::ExitStatus::CrashExit) + if (m_process.exitStatus() == QProcess::CrashExit) emit crashed(); else emit finished();