Valgrind: Merge MemCheckRunner and ValgrindRunner base

It's mostly the xml/log handling, which can be re-used in other tools.

The change is purely mechanical, including some style fixes and
some modernization.

Change-Id: I6b44ae71451e8d3e26df40b9af9b4ec70038a92d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 12 insertions, 16 deletions

diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.h b/src/plugins/valgrind/valgrindmemcheckparsertest.h
index b431047ed0..dca3829c9c 100644
--- a/src/plugins/valgrind/valgrindmemcheckparsertest.h
+++ b/src/plugins/valgrind/valgrindmemcheckparsertest.h
@@ -36,7 +36,7 @@
 #include "xmlprotocol/status.h"
 #include "xmlprotocol/threadedparser.h"
 #include "xmlprotocol/parser.h"
-#include "memcheck/memcheckrunner.h"
+#include "valgrindrunner.h"
 
 QT_BEGIN_NAMESPACE
 class QTcpServer;
@@ -44,7 +44,6 @@ class QTcpSocket;
 class QProcess;
 QT_END_NAMESPACE
 
-
 namespace Valgrind {
 namespace Test {
 
@@ -92,19 +91,17 @@ class RunnerDumper : public QObject
     Q_OBJECT
 
 public:
-    explicit RunnerDumper(Valgrind::Memcheck::MemcheckRunner *runner, Valgrind::XmlProtocol::ThreadedParser *parser)
-        : QObject()
-        , m_errorReceived(false)
+    explicit RunnerDumper(ValgrindRunner *runner, XmlProtocol::ThreadedParser *parser)
     {
-        connect(parser, &Valgrind::XmlProtocol::ThreadedParser::error,
+        connect(parser, &XmlProtocol::ThreadedParser::error,
                 this, &RunnerDumper::error);
-        connect(parser, &Valgrind::XmlProtocol::ThreadedParser::internalError,
+        connect(parser, &XmlProtocol::ThreadedParser::internalError,
                 this, &RunnerDumper::internalError);
-        connect(parser, &Valgrind::XmlProtocol::ThreadedParser::status,
+        connect(parser, &XmlProtocol::ThreadedParser::status,
                 this, &RunnerDumper::status);
-        connect(runner, &Valgrind::Memcheck::MemcheckRunner::logMessageReceived,
+        connect(runner, &ValgrindRunner::logMessageReceived,
                 this, &RunnerDumper::logMessageReceived);
-        connect(runner, &Valgrind::ValgrindRunner::processErrorReceived,
+        connect(runner, &ValgrindRunner::processErrorReceived,
                 this, &RunnerDumper::processErrorReceived);
     }
 
@@ -133,15 +130,14 @@ public:
     }
 
 public:
-    bool m_errorReceived;
-
+    bool m_errorReceived = false;
 };
 
 class ValgrindMemcheckParserTest : public QObject
 {
     Q_OBJECT
 
-private Q_SLOTS:
+private slots:
     void initTestCase();
     void cleanup();
 
@@ -162,9 +158,9 @@ private Q_SLOTS:
 private:
     void initTest(const QString &testfile, const QStringList &otherArgs = QStringList());
 
-    QTcpServer *m_server = 0;
-    QProcess *m_process = 0;
-    QTcpSocket *m_socket = 0;
+    QTcpServer *m_server = nullptr;
+    QProcess *m_process = nullptr;
+    QTcpSocket *m_socket = nullptr;
 };
 
 } // namespace Test