diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp index d8f453830cc..5598f7cdb03 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include @@ -148,17 +147,17 @@ void ValgrindMemcheckParserTest::initTest(const QString &testfile, const QString { QVERIFY(!m_server->hasPendingConnections()); - m_process = new QProcess(m_server); + m_process.reset(new Process); m_process->setProcessChannelMode(QProcess::ForwardedChannels); const QString fakeValgrind = fakeValgrindExecutable(); const QFileInfo fileInfo(fakeValgrind); QVERIFY2(fileInfo.isExecutable(), qPrintable(fakeValgrind)); QVERIFY2(!fileInfo.isDir(), qPrintable(fakeValgrind)); - m_process->start( - fakeValgrind, - QStringList({QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()), "-i", - testfile}) << otherArgs); + const QStringList args = {QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()), + "-i", testfile}; + m_process->setCommand({FilePath::fromString(fakeValgrind), args + otherArgs}); + m_process->start(); QVERIFY(m_process->waitForStarted(5000)); QCOMPARE(m_process->state(), QProcess::Running); @@ -171,10 +170,7 @@ void ValgrindMemcheckParserTest::initTest(const QString &testfile, const QString void ValgrindMemcheckParserTest::cleanup() { m_socket.reset(); - if (m_process) { - delete m_process; - m_process = nullptr; - } + m_process.reset(); } void ValgrindMemcheckParserTest::testHelgrindSample1() diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.h b/src/plugins/valgrind/valgrindmemcheckparsertest.h index f2f2bb0073c..0d10ac0617f 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.h +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.h @@ -3,12 +3,12 @@ #pragma once -#include +#include + #include #include QT_BEGIN_NAMESPACE -class QProcess; class QTcpServer; QT_END_NAMESPACE @@ -40,7 +40,7 @@ private: void initTest(const QString &testfile, const QStringList &otherArgs = {}); QTcpServer *m_server = nullptr; - QProcess *m_process = nullptr; + std::unique_ptr m_process; std::unique_ptr m_socket; };