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

QtcProcess: Remove unused signals

Browse Source 
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:
Jarek Kobus
2022-06-22 15:42:24 +02:00
parent a1ad64a50b
commit e5942932f4
2 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libs/utils/qtcprocess.cpp
View File

@@ -726,13 +726,10 @@ public:
void handleStarted(qint64 processId, qint64 applicationMainThreadId);
void handleReadyRead(const QByteArray &outputData, const QByteArray &errorData);
void handleDone(const ProcessResultData &data);
void handleError();
void clearForRun();
void emitStarted();
void emitFinished();
void emitDone();
void emitErrorOccurred(QProcess::ProcessError error);
void emitReadyReadStandardOutput();
void emitReadyReadStandardError();
@@ -2031,9 +2028,8 @@ void QtcProcessPrivate::handleDone(const ProcessResultData &data)
// HACK: See QIODevice::errorString() implementation.
if (m_resultData.m_error == QProcess::UnknownError)
m_resultData.m_errorString.clear();
if (m_resultData.m_error != QProcess::UnknownError)
handleError();
else if (m_result != ProcessResult::Hang)
m_result = ProcessResult::StartFailed;
if (debug)
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_stdErr.handleRest();
if (m_resultData.m_error != QProcess::FailedToStart)
emitFinished();
emitDone();
m_processId = 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()
{
GuardLocker locker(m_guard);
emit q->started();
}
void QtcProcessPrivate::emitFinished()
{
GuardLocker locker(m_guard);
emit q->finished();
}
void QtcProcessPrivate::emitDone()
{
GuardLocker locker(m_guard);
emit q->done();
}
void QtcProcessPrivate::emitErrorOccurred(QProcess::ProcessError error)
{
GuardLocker locker(m_guard);
emit q->errorOccurred(error);
}
void QtcProcessPrivate::emitReadyReadStandardOutput()
{
GuardLocker locker(m_guard);

5
src/libs/utils/qtcprocess.h
View File

@@ -201,10 +201,7 @@ public:
signals:
void started();
void finished();
void done(); // The same as finished() with the addition it's being also emitted after
// FailedToStart error occurred.
void errorOccurred(QProcess::ProcessError error);
void done();
void readyReadStandardOutput();
void readyReadStandardError();