From ff6f3dc65d6f70f0e4a0ce96c9c07ea33f3d9fe1 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 16 Jun 2022 13:53:26 +0200
Subject: [PATCH] Valgrind: Consolidate message production and consumption

Change-Id: I779f97a658b55f3c79111df1946b8d72863ce513
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/valgrind/valgrindengine.cpp |  9 ++-------
 src/plugins/valgrind/valgrindengine.h   |  1 -
 src/plugins/valgrind/valgrindrunner.cpp | 10 +++++-----
 src/plugins/valgrind/valgrindrunner.h   |  3 ++-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index fc914a1d9f8..fdb147e1c74 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -61,8 +61,8 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl)
 
     m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS));
 
-    connect(&m_runner, &ValgrindRunner::processOutputReceived,
-            this, &ValgrindToolRunner::receiveProcessOutput);
+    connect(&m_runner, &ValgrindRunner::appendMessage,
+            this, &ValgrindToolRunner::appendMessage);
     connect(&m_runner, &ValgrindRunner::valgrindExecuted,
             this, [this](const QString &commandLine) {
         appendMessage(commandLine, NormalMessageFormat);
@@ -162,11 +162,6 @@ void ValgrindToolRunner::runnerFinished()
     reportStopped();
 }
 
-void ValgrindToolRunner::receiveProcessOutput(const QString &output, OutputFormat format)
-{
-    appendMessage(output, format);
-}
-
 void ValgrindToolRunner::receiveProcessError(const QString &message, QProcess::ProcessError error)
 {
     if (error == QProcess::FailedToStart) {
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index 06e767b7629..8bb050405af 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -60,7 +60,6 @@ private:
     void handleProgressFinished();
     void runnerFinished();
 
-    void receiveProcessOutput(const QString &output, Utils::OutputFormat format);
     void receiveProcessError(const QString &message, QProcess::ProcessError error);
 
     QStringList genericToolArguments() const;
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index ce43ea5b41b..376cc30927e 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -120,12 +120,12 @@ bool ValgrindRunner::Private::run()
             this, &ValgrindRunner::Private::processDone);
 
     connect(&m_valgrindProcess, &QtcProcess::readyReadStandardOutput, q, [this] {
-        q->processOutputReceived(QString::fromUtf8(m_valgrindProcess.readAllStandardOutput()),
-                                 Utils::StdOutFormat);
+        emit q->appendMessage(QString::fromUtf8(m_valgrindProcess.readAllStandardOutput()),
+                              StdOutFormat);
     });
     connect(&m_valgrindProcess, &QtcProcess::readyReadStandardError, q, [this] {
-        q->processOutputReceived(QString::fromUtf8(m_valgrindProcess.readAllStandardError()),
-                                 Utils::StdErrFormat);
+        emit q->appendMessage(QString::fromUtf8(m_valgrindProcess.readAllStandardError()),
+                              StdErrFormat);
     });
 
     if (cmd.executable().osType() == OsTypeMac) {
@@ -210,7 +210,7 @@ void ValgrindRunner::Private::remoteProcessStarted()
 void ValgrindRunner::Private::findPidProcessDone()
 {
     if (m_findPID.result() != ProcessResult::FinishedWithSuccess) {
-        emit q->processOutputReceived(m_findPID.allOutput(), StdErrFormat);
+        emit q->appendMessage(m_findPID.allOutput(), StdErrFormat);
         return;
     }
     QString out = m_findPID.cleanedStdOut();
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index e79dc1bbf42..f6182a895a7 100644
--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -64,8 +64,9 @@ public:
     XmlProtocol::ThreadedParser *parser() const;
 
 signals:
+    void appendMessage(const QString &, Utils::OutputFormat);
+
     void logMessageReceived(const QByteArray &);
-    void processOutputReceived(const QString &, Utils::OutputFormat);
     void processErrorReceived(const QString &, QProcess::ProcessError);
     void valgrindExecuted(const QString &);
     void valgrindStarted(qint64 pid);