forked from qt-creator/qt-creator
QtcProcess: Remove unused signals
Change-Id: I5ceca4310de670dc52542607c549a159cbe697f9 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -726,13 +726,10 @@ public:
|
|||||||
void handleStarted(qint64 processId, qint64 applicationMainThreadId);
|
void handleStarted(qint64 processId, qint64 applicationMainThreadId);
|
||||||
void handleReadyRead(const QByteArray &outputData, const QByteArray &errorData);
|
void handleReadyRead(const QByteArray &outputData, const QByteArray &errorData);
|
||||||
void handleDone(const ProcessResultData &data);
|
void handleDone(const ProcessResultData &data);
|
||||||
void handleError();
|
|
||||||
void clearForRun();
|
void clearForRun();
|
||||||
|
|
||||||
void emitStarted();
|
void emitStarted();
|
||||||
void emitFinished();
|
|
||||||
void emitDone();
|
void emitDone();
|
||||||
void emitErrorOccurred(QProcess::ProcessError error);
|
|
||||||
void emitReadyReadStandardOutput();
|
void emitReadyReadStandardOutput();
|
||||||
void emitReadyReadStandardError();
|
void emitReadyReadStandardError();
|
||||||
|
|
||||||
@@ -2031,9 +2028,8 @@ void QtcProcessPrivate::handleDone(const ProcessResultData &data)
|
|||||||
// HACK: See QIODevice::errorString() implementation.
|
// HACK: See QIODevice::errorString() implementation.
|
||||||
if (m_resultData.m_error == QProcess::UnknownError)
|
if (m_resultData.m_error == QProcess::UnknownError)
|
||||||
m_resultData.m_errorString.clear();
|
m_resultData.m_errorString.clear();
|
||||||
|
else if (m_result != ProcessResult::Hang)
|
||||||
if (m_resultData.m_error != QProcess::UnknownError)
|
m_result = ProcessResult::StartFailed;
|
||||||
handleError();
|
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
qDebug() << Q_FUNC_INFO << m_resultData.m_exitCode << m_resultData.m_exitStatus;
|
qDebug() << Q_FUNC_INFO << m_resultData.m_exitCode << m_resultData.m_exitStatus;
|
||||||
@@ -2057,49 +2053,23 @@ void QtcProcessPrivate::handleDone(const ProcessResultData &data)
|
|||||||
m_stdOut.handleRest();
|
m_stdOut.handleRest();
|
||||||
m_stdErr.handleRest();
|
m_stdErr.handleRest();
|
||||||
|
|
||||||
if (m_resultData.m_error != QProcess::FailedToStart)
|
|
||||||
emitFinished();
|
|
||||||
|
|
||||||
emitDone();
|
emitDone();
|
||||||
m_processId = 0;
|
m_processId = 0;
|
||||||
m_applicationMainThreadId = 0;
|
m_applicationMainThreadId = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtcProcessPrivate::handleError()
|
|
||||||
{
|
|
||||||
m_hangTimerCount = 0;
|
|
||||||
if (debug)
|
|
||||||
qDebug() << Q_FUNC_INFO << m_resultData.m_error;
|
|
||||||
// Was hang detected before and killed?
|
|
||||||
if (m_result != ProcessResult::Hang)
|
|
||||||
m_result = ProcessResult::StartFailed;
|
|
||||||
emitErrorOccurred(m_resultData.m_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
void QtcProcessPrivate::emitStarted()
|
void QtcProcessPrivate::emitStarted()
|
||||||
{
|
{
|
||||||
GuardLocker locker(m_guard);
|
GuardLocker locker(m_guard);
|
||||||
emit q->started();
|
emit q->started();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtcProcessPrivate::emitFinished()
|
|
||||||
{
|
|
||||||
GuardLocker locker(m_guard);
|
|
||||||
emit q->finished();
|
|
||||||
}
|
|
||||||
|
|
||||||
void QtcProcessPrivate::emitDone()
|
void QtcProcessPrivate::emitDone()
|
||||||
{
|
{
|
||||||
GuardLocker locker(m_guard);
|
GuardLocker locker(m_guard);
|
||||||
emit q->done();
|
emit q->done();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtcProcessPrivate::emitErrorOccurred(QProcess::ProcessError error)
|
|
||||||
{
|
|
||||||
GuardLocker locker(m_guard);
|
|
||||||
emit q->errorOccurred(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
void QtcProcessPrivate::emitReadyReadStandardOutput()
|
void QtcProcessPrivate::emitReadyReadStandardOutput()
|
||||||
{
|
{
|
||||||
GuardLocker locker(m_guard);
|
GuardLocker locker(m_guard);
|
||||||
|
|||||||
@@ -201,10 +201,7 @@ public:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void started();
|
void started();
|
||||||
void finished();
|
void done();
|
||||||
void done(); // The same as finished() with the addition it's being also emitted after
|
|
||||||
// FailedToStart error occurred.
|
|
||||||
void errorOccurred(QProcess::ProcessError error);
|
|
||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user