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

CppCheck: Use line-based output callback

Browse Source 
Change-Id: I1b2341f71908a00f820b47109fcc4fda2134a83b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-06-04 11:41:13 +02:00
parent 133b3b58a7
commit c624467a5f
1 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/cppcheck/cppcheckrunner.cpp
View File

@@ -49,10 +49,13 @@ CppcheckRunner::CppcheckRunner(CppcheckTool &tool) :
m_maxArgumentsLength = std::max(argMax.toInt(), m_maxArgumentsLength); m_maxArgumentsLength = std::max(argMax.toInt(), m_maxArgumentsLength);
} }
connect(m_process, &QtcProcess::readyReadStandardOutput, m_process->setStdOutLineCallback([this](const QString &line) {
this, &CppcheckRunner::readOutput); m_tool.parseOutputLine(line);
connect(m_process, &QtcProcess::readyReadStandardOutput, });
this, &CppcheckRunner::readError); m_process->setStdErrLineCallback([this](const QString &line) {
m_tool.parseErrorLine(line);
});
connect(m_process, &QtcProcess::started, connect(m_process, &QtcProcess::started,
this, &CppcheckRunner::handleStarted); this, &CppcheckRunner::handleStarted);
connect(m_process, &QtcProcess::finished, connect(m_process, &QtcProcess::finished,
@@ -158,36 +161,6 @@ void CppcheckRunner::checkQueued()
m_process->start(); m_process->start();
} }
void CppcheckRunner::readOutput()
{
if (!m_isRunning) // workaround for QTBUG-30929
handleStarted();
const QByteArray output = m_process->readAllStandardOutput();
int start = 0;
int end;
do {
end = output.indexOf('\n', start);
m_tool.parseOutputLine(QString::fromUtf8(output.mid(start, end - start)));
start = end + 1;
} while (end >= 0);
}
void CppcheckRunner::readError()
{
if (!m_isRunning) // workaround for QTBUG-30929
handleStarted();
const QByteArray output = m_process->readAllStandardError();
int start = 0;
int end;
do {
end = output.indexOf('\n', start);
m_tool.parseErrorLine(QString::fromUtf8(output.mid(start, end - start)));
start = end + 1;
} while (end >= 0);
}
void CppcheckRunner::handleStarted() void CppcheckRunner::handleStarted()
{ {
if (m_isRunning) if (m_isRunning)
@@ -200,8 +173,6 @@ void CppcheckRunner::handleStarted()
void CppcheckRunner::handleFinished(int) void CppcheckRunner::handleFinished(int)
{ {
if (m_process->error() != QProcess::FailedToStart) { if (m_process->error() != QProcess::FailedToStart) {
readOutput();
readError();
m_tool.finishParsing(); m_tool.finishParsing();
} else { } else {
const QString message = tr("Cppcheck failed to start: \"%1\".").arg(currentCommand()); const QString message = tr("Cppcheck failed to start: \"%1\".").arg(currentCommand());