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

Introduce ProcessResultData

Browse Source 
It should be useful when reimplementing ProcessInterface.
It replaces 4 virtual methods with just 1.

Task-number: QTCREATORBUG-27358
Change-Id: I2dafbfbc25f8f016ff2aa19c1a176335a4a7498c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-04-08 17:24:59 +02:00
parent 104bbfc713
commit 936c44f367
11 changed files with 126 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/utils/terminalprocess.cpp
View File

@@ -127,13 +127,10 @@ public:
: m_process(parent) {}
qint64 m_processId = 0;
int m_exitCode = 0;
QProcess::ExitStatus m_appStatus = QProcess::NormalExit;
ProcessResultData m_result;
QLocalServer m_stubServer;
QLocalSocket *m_stubSocket = nullptr;
QTemporaryFile *m_tempFile = nullptr;
QProcess::ProcessError m_error = QProcess::UnknownError;
QString m_errorString;
// Used on Unix only
QtcProcess m_process;
@@ -178,8 +175,7 @@ void TerminalImpl::start()
if (isRunning())
return;
d->m_errorString.clear();
d->m_error = QProcess::UnknownError;
d->m_result = {};
#ifdef Q_OS_WIN
@@ -449,8 +445,8 @@ void TerminalImpl::cleanupAfterStartFailure(const QString &errorMessage)
void TerminalImpl::finish(int exitCode, QProcess::ExitStatus exitStatus)
{
d->m_processId = 0;
d->m_exitCode = exitCode;
d->m_appStatus = exitStatus;
d->m_result.m_exitCode = exitCode;
d->m_result.m_exitStatus = exitStatus;
emit finished();
}
@@ -745,30 +741,15 @@ qint64 TerminalImpl::processId() const
return d->m_processId;
}
int TerminalImpl::exitCode() const
ProcessResultData TerminalImpl::resultData() const
{
return d->m_exitCode;
} // This will be the signal number if exitStatus == CrashExit
QProcess::ExitStatus TerminalImpl::exitStatus() const
{
return d->m_appStatus;
}
QProcess::ProcessError TerminalImpl::error() const
{
return d->m_error;
}
QString TerminalImpl::errorString() const
{
return d->m_errorString;
return d->m_result;
}
void TerminalImpl::emitError(QProcess::ProcessError err, const QString &errorString)
{
d->m_error = err;
d->m_errorString = errorString;
d->m_result.m_error = err;
d->m_result.m_errorString = errorString;
emit errorOccurred(err);
}