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

Utils: Move remaining SynchrounousProcess functionality

Browse Source 
To QtcProcess, as penultimate step to fully merge the two.

Change-Id: Iaab3bc3e50165f732838335bd185632f33a97900
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-06-22 04:05:20 +02:00
parent a803d04c17
commit 32895873e4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,13 +142,15 @@ public:
connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &QtcProcessPrivate::slotFinished); this, &QtcProcessPrivate::slotFinished);
connect(m_process, &QProcess::errorOccurred, connect(m_process, &QProcess::errorOccurred,
q, &QtcProcess::errorOccurred); this, &QtcProcessPrivate::slotError);
connect(m_process, &QProcess::stateChanged, connect(m_process, &QProcess::stateChanged,
q, &QtcProcess::stateChanged); q, &QtcProcess::stateChanged);
connect(m_process, &QProcess::readyReadStandardOutput, connect(m_process, &QProcess::readyReadStandardOutput,
this, &QtcProcessPrivate::handleReadyReadStandardOutput); this, &QtcProcessPrivate::handleReadyReadStandardOutput);
connect(m_process, &QProcess::readyReadStandardError, connect(m_process, &QProcess::readyReadStandardError,
this, &QtcProcessPrivate::handleReadyReadStandardError); this, &QtcProcessPrivate::handleReadyReadStandardError);
connect(&m_timer, &QTimer::timeout, this, &QtcProcessPrivate::slotTimeout);
m_timer.setInterval(1000);
} }
~QtcProcessPrivate() ~QtcProcessPrivate()
@@ -250,6 +252,8 @@ QtcProcess::QtcProcess(QObject *parent)
QtcProcess::~QtcProcess() QtcProcess::~QtcProcess()
{ {
disconnect(&d->m_timer, nullptr, this, nullptr);
disconnect(this, nullptr, this, nullptr);
delete d; delete d;
} }
@@ -946,16 +950,10 @@ void ChannelBuffer::handleRest()
SynchronousProcess::SynchronousProcess() SynchronousProcess::SynchronousProcess()
{ {
d->m_isSynchronousProcess = true; // Only for QTC_ASSERTs above. d->m_isSynchronousProcess = true; // Only for QTC_ASSERTs above.
d->m_timer.setInterval(1000);
connect(&d->m_timer, &QTimer::timeout, d, &QtcProcessPrivate::slotTimeout);
connect(d->m_process, &QProcess::errorOccurred, d, &QtcProcessPrivate::slotError);
} }
SynchronousProcess::~SynchronousProcess() SynchronousProcess::~SynchronousProcess()
{ {
disconnect(&d->m_timer, nullptr, this, nullptr);
disconnect(this, nullptr, this, nullptr);
} }
void SynchronousProcess::setProcessUserEventWhileRunning() void SynchronousProcess::setProcessUserEventWhileRunning()
@@ -1152,16 +1150,18 @@ void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus status)
emit q->finished(); emit q->finished();
} }
void QtcProcessPrivate::slotError(QProcess::ProcessError e) void QtcProcessPrivate::slotError(QProcess::ProcessError error)
{ {
m_hangTimerCount = 0; m_hangTimerCount = 0;
if (debug) if (debug)
qDebug() << Q_FUNC_INFO << e; qDebug() << Q_FUNC_INFO << error;
// Was hang detected before and killed? // Was hang detected before and killed?
if (m_result != QtcProcess::Hang) if (m_result != QtcProcess::Hang)
m_result = QtcProcess::StartFailed; m_result = QtcProcess::StartFailed;
m_startFailure = true; m_startFailure = true;
m_eventLoop.quit(); m_eventLoop.quit();
emit q->errorOccurred(error);
} }
} // namespace Utils } // namespace Utils