From 604cf67a0c47d3c28c5536b03058199e4e278b2c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 16 Aug 2023 12:15:18 +0200 Subject: [PATCH] ValgrindRunner: Get rid of valgrindExecuted() signal Use appendMessage() signal instead. Change-Id: I2beb70d1c9f59e6b8b3b1ad03ec7707d67aa50cd Reviewed-by: hjk --- src/plugins/valgrind/valgrindengine.cpp | 8 +------- src/plugins/valgrind/valgrindrunner.cpp | 2 +- src/plugins/valgrind/valgrindrunner.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 601ba20ec9d..c837b7097b2 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -37,14 +37,8 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl) m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS)); - connect(&m_runner, - &ValgrindRunner::appendMessage, - this, + connect(&m_runner, &ValgrindRunner::appendMessage, this, [this](const QString &msg, Utils::OutputFormat format) { appendMessage(msg, format); }); - connect(&m_runner, &ValgrindRunner::valgrindExecuted, - this, [this](const QString &commandLine) { - appendMessage(commandLine, NormalMessageFormat); - }); connect(&m_runner, &ValgrindRunner::processErrorReceived, this, &ValgrindToolRunner::receiveProcessError); connect(&m_runner, &ValgrindRunner::finished, diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index d6dd5eb7496..8b4e36f728d 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -156,7 +156,7 @@ bool ValgrindRunner::Private::run() cmd.addCommandLineAsArgs(m_debuggee.command); - emit q->valgrindExecuted(cmd.toUserOutput()); + emit q->appendMessage(cmd.toUserOutput(), NormalMessageFormat); m_process.setCommand(cmd); m_process.setWorkingDirectory(m_debuggee.workingDirectory); diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index c90be9cf927..e7fabc68bf5 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -44,10 +44,8 @@ public: signals: void appendMessage(const QString &, Utils::OutputFormat); - void logMessageReceived(const QByteArray &); void processErrorReceived(const QString &, QProcess::ProcessError); - void valgrindExecuted(const QString &); void valgrindStarted(qint64 pid); void finished();