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

QtcProcess: Limit the inclusion of qtcprocess.h

Browse Source 
Move the rest of QtcProcess enums to processenums.h.
Move ExitCodeInterpreter into processenums.h.
Remove superfluous Utils:: prefix.

Change-Id: Iaa596f353d33d6930085a621b114cc15a35caa80
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2022-03-02 04:12:25 +01:00
parent 6ff1723c4c
commit 8e0ae8ba96
76 changed files with 335 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,13 @@
#include "environment.h"
#include "fileutils.h"
#include "qtcassert.h"
#include "qtcprocess.h"
#include "runextensions.h"
#include <QFileInfo>
#include <QFuture>
#include <QFutureWatcher>
#include <QMutex>
#include <QProcess>
#include <QProcessEnvironment>
#include <QScopedPointer>
#include <QSharedPointer>
@@ -280,7 +280,7 @@ void ShellCommand::run(QFutureInterface<void> &future)
stdOut += proc.stdOut();
stdErr += proc.stdErr();
d->m_lastExecExitCode = proc.exitCode();
d->m_lastExecSuccess = proc.result() == QtcProcess::FinishedWithSuccess;
d->m_lastExecSuccess = proc.result() == ProcessResult::FinishedWithSuccess;
if (!d->m_lastExecSuccess)
break;
}
@@ -314,7 +314,7 @@ void ShellCommand::runCommand(QtcProcess &proc,
const FilePath dir = workDirectory(workingDirectory);
if (command.executable().isEmpty()) {
proc.setResult(QtcProcess::StartFailed);
proc.setResult(ProcessResult::StartFailed);
return;
}
@@ -332,7 +332,7 @@ void ShellCommand::runCommand(QtcProcess &proc,
if (!d->m_aborted) {
// Success/Fail message in appropriate window?
if (proc.result() == QtcProcess::FinishedWithSuccess) {
if (proc.result() == ProcessResult::FinishedWithSuccess) {
if (d->m_flags & ShowSuccessMessage)
emit appendMessage(proc.exitMessage());
} else if (!(d->m_flags & SuppressFailMessage)) {
@@ -416,7 +416,7 @@ void ShellCommand::runSynchronous(QtcProcess &process, const FilePath &workingDi
if (d->m_codec)
process.setCodec(d->m_codec);
process.runBlocking(QtcProcess::WithEventLoop);
process.runBlocking(EventLoopMode::On);
}
const QVariant &ShellCommand::cookie() const