forked from qt-creator/qt-creator
ProcessInterface: Drop arguments from finished() signal
Make the API more similar to QtcProcess API. Change-Id: If62051908b7974008bebda21dd288b02e7a772f3 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -256,7 +256,7 @@ void CallerHandle::handleFinished(const FinishedSignal *launcherSignal)
|
|||||||
m_processState = QProcess::NotRunning;
|
m_processState = QProcess::NotRunning;
|
||||||
m_exitStatus = launcherSignal->exitStatus();
|
m_exitStatus = launcherSignal->exitStatus();
|
||||||
m_exitCode = launcherSignal->exitCode();
|
m_exitCode = launcherSignal->exitCode();
|
||||||
emit finished(m_exitCode, m_exitStatus);
|
emit finished();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called from launcher's thread exclusively.
|
// Called from launcher's thread exclusively.
|
||||||
|
@@ -118,7 +118,7 @@ public:
|
|||||||
signals:
|
signals:
|
||||||
void errorOccurred(QProcess::ProcessError error);
|
void errorOccurred(QProcess::ProcessError error);
|
||||||
void started();
|
void started();
|
||||||
void finished(int exitCode, QProcess::ExitStatus status);
|
void finished();
|
||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
|
|
||||||
|
@@ -528,7 +528,7 @@ public:
|
|||||||
ProcessSetupData m_setup;
|
ProcessSetupData m_setup;
|
||||||
|
|
||||||
void slotTimeout();
|
void slotTimeout();
|
||||||
void slotFinished(int exitCode, QProcess::ExitStatus e);
|
void slotFinished();
|
||||||
void handleError(QProcess::ProcessError error);
|
void handleError(QProcess::ProcessError error);
|
||||||
void clearForRun();
|
void clearForRun();
|
||||||
|
|
||||||
@@ -1255,7 +1255,7 @@ void QtcProcess::beginFeed()
|
|||||||
|
|
||||||
void QtcProcess::endFeed()
|
void QtcProcess::endFeed()
|
||||||
{
|
{
|
||||||
d->slotFinished(0, QProcess::NormalExit);
|
d->slotFinished();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtcProcess::feedStdOut(const QByteArray &data)
|
void QtcProcess::feedStdOut(const QByteArray &data)
|
||||||
@@ -1608,8 +1608,10 @@ void QtcProcessPrivate::slotTimeout()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus status)
|
void QtcProcessPrivate::slotFinished()
|
||||||
{
|
{
|
||||||
|
const int exitCode = m_process->exitCode();
|
||||||
|
const QProcess::ExitStatus status = m_process->exitStatus();
|
||||||
if (debug)
|
if (debug)
|
||||||
qDebug() << Q_FUNC_INFO << exitCode << status;
|
qDebug() << Q_FUNC_INFO << exitCode << status;
|
||||||
m_hangTimerCount = 0;
|
m_hangTimerCount = 0;
|
||||||
|
@@ -309,7 +309,7 @@ public:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void started();
|
void started();
|
||||||
void finished(int exitCode, QProcess::ExitStatus status);
|
void finished();
|
||||||
void errorOccurred(QProcess::ProcessError error);
|
void errorOccurred(QProcess::ProcessError error);
|
||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
|
@@ -476,7 +476,7 @@ void TerminalProcess::finish(int exitCode, QProcess::ExitStatus exitStatus)
|
|||||||
d->m_processId = 0;
|
d->m_processId = 0;
|
||||||
d->m_exitCode = exitCode;
|
d->m_exitCode = exitCode;
|
||||||
d->m_appStatus = exitStatus;
|
d->m_appStatus = exitStatus;
|
||||||
emit finished(exitCode, exitStatus);
|
emit finished();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TerminalProcess::kickoffProcess()
|
void TerminalProcess::kickoffProcess()
|
||||||
|
@@ -74,7 +74,7 @@ public:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void started();
|
void started();
|
||||||
void finished(int exitCode, QProcess::ExitStatus status);
|
void finished();
|
||||||
void errorOccurred(QProcess::ProcessError error);
|
void errorOccurred(QProcess::ProcessError error);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Reference in New Issue
Block a user