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

GerritModel: Connect to QtcProcess::done() signal

Browse Source 
Instead of connecting to errorOccurred() and finished() signals.

Change-Id: Ibd5afa812cc9f8781984b649c9cb85a8703e9c8e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-04-21 23:13:10 +02:00
parent 9daad02b92
commit 41c2e23129
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -245,8 +245,7 @@ signals:
void finished(); void finished();
private: private:
void processError(QProcess::ProcessError); void processDone();
void processFinished();
void timeout(); void timeout();
void errorTermination(const QString &msg); void errorTermination(const QString &msg);
@@ -292,8 +291,7 @@ QueryContext::QueryContext(const QString &query,
connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] { connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
m_output.append(m_process.readAllStandardOutput()); m_output.append(m_process.readAllStandardOutput());
}); });
connect(&m_process, &QtcProcess::finished, this, &QueryContext::processFinished); connect(&m_process, &QtcProcess::done, this, &QueryContext::processDone);
connect(&m_process, &QtcProcess::errorOccurred, this, &QueryContext::processError);
connect(&m_watcher, &QFutureWatcherBase::canceled, this, &QueryContext::terminate); connect(&m_watcher, &QFutureWatcherBase::canceled, this, &QueryContext::terminate);
m_watcher.setFuture(m_progress.future()); m_watcher.setFuture(m_progress.future());
m_process.setEnvironment(Git::Internal::GitClient::instance()->processEnvironment()); m_process.setEnvironment(Git::Internal::GitClient::instance()->processEnvironment());
@@ -332,8 +330,6 @@ void QueryContext::errorTermination(const QString &msg)
if (!m_progress.isCanceled()) if (!m_progress.isCanceled())
VcsOutputWindow::appendError(msg); VcsOutputWindow::appendError(msg);
m_progress.reportCanceled(); m_progress.reportCanceled();
m_progress.reportFinished();
emit finished();
} }
void QueryContext::terminate() void QueryContext::terminate()
@@ -341,28 +337,23 @@ void QueryContext::terminate()
m_process.stopProcess(); m_process.stopProcess();
} }
void QueryContext::processError(QProcess::ProcessError e) void QueryContext::processDone()
{
const QString msg = tr("Error running %1: %2").arg(m_binary.toUserOutput(), m_process.errorString());
if (e == QProcess::FailedToStart)
errorTermination(msg);
else
VcsOutputWindow::appendError(msg);
}
void QueryContext::processFinished()
{ {
if (m_timer.isActive()) if (m_timer.isActive())
m_timer.stop(); m_timer.stop();
if (!m_error.isEmpty())
emit errorText(m_error); emit errorText(m_error);
if (m_process.exitStatus() != QProcess::NormalExit) {
if (m_process.exitStatus() == QProcess::CrashExit)
errorTermination(tr("%1 crashed.").arg(m_binary.toUserOutput())); errorTermination(tr("%1 crashed.").arg(m_binary.toUserOutput()));
return; else if (m_process.exitCode())
} else if (m_process.exitCode()) {
errorTermination(tr("%1 returned %2.").arg(m_binary.toUserOutput()).arg(m_process.exitCode())); errorTermination(tr("%1 returned %2.").arg(m_binary.toUserOutput()).arg(m_process.exitCode()));
return; else if (m_process.result() != ProcessResult::FinishedWithSuccess)
} errorTermination(tr("Error running %1: %2").arg(m_binary.toUserOutput(), m_process.errorString()));
else
emit resultRetrieved(m_output); emit resultRetrieved(m_output);
m_progress.reportFinished(); m_progress.reportFinished();
emit finished(); emit finished();
} }