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

Valgrind: Make the (threaded) parser a proper member of the runner

Browse Source 
Simplifies user code, and it was only ever used in a 1:1 relation,
even in the tests.

Change-Id: I3ce4fc83a361aceb730c05420efdb4ea52d37cda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-06-21 09:01:48 +02:00
parent 7edd5876a5
commit fc8dee4675
9 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -59,7 +59,7 @@ public:
QString tool;
QTcpServer xmlServer;
XmlProtocol::ThreadedParser *parser = nullptr;
XmlProtocol::ThreadedParser parser;
QTcpServer logServer;
QTcpSocket *logSocket = nullptr;
bool disableXml = false;
@@ -77,7 +77,7 @@ ValgrindRunner::~ValgrindRunner()
// make sure we don't delete the thread while it's still running
waitForFinished();
}
if (d->parser->isRunning()) {
if (d->parser.isRunning()) {
// make sure we don't delete the thread while it's still running
waitForFinished();
}
@@ -238,10 +238,9 @@ ValgrindProcess *ValgrindRunner::valgrindProcess() const
return d->process;
}
void ValgrindRunner::setParser(XmlProtocol::ThreadedParser *parser)
XmlProtocol::ThreadedParser *ValgrindRunner::parser() const
{
QTC_ASSERT(!d->parser, qt_noop());
d->parser = parser;
return &d->parser;
}
@@ -257,7 +256,7 @@ void ValgrindRunner::xmlSocketConnected()
QTcpSocket *socket = d->xmlServer.nextPendingConnection();
QTC_ASSERT(socket, return);
d->xmlServer.close();
d->parser->parse(socket);
d->parser.parse(socket);
}
void ValgrindRunner::logSocketConnected()