From dd065bb6ea820b9a697b9722c7800eea2877ba6d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 19 Feb 2025 18:02:30 +0100 Subject: [PATCH] Valgrind: Get rid of setProgressTitle() setter Add an arg to the ValgrindToolRunner's c'tor instead. Change-Id: Iead5d184d1eb0c2326c6f710befd16b6d0408cd8 Reviewed-by: hjk --- src/plugins/valgrind/callgrindtool.cpp | 3 +-- src/plugins/valgrind/memchecktool.cpp | 3 +-- src/plugins/valgrind/valgrindengine.cpp | 3 ++- src/plugins/valgrind/valgrindengine.h | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 6d6cabc846c..2f36184ddb2 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -97,10 +97,9 @@ class CallgrindToolRunner : public ValgrindToolRunner { public: explicit CallgrindToolRunner(ProjectExplorer::RunControl *runControl) - : ValgrindToolRunner(runControl) + : ValgrindToolRunner(runControl, Tr::tr("Profiling")) { setId("CallgrindToolRunner"); - setProgressTitle(Tr::tr("Profiling")); connect(&m_runner, &ValgrindProcess::valgrindStarted, this, [](qint64 pid) { setupPid(pid); }); connect(&m_runner, &ValgrindProcess::done, this, [] { startParser(); }); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index fd95bd0bf50..b6802331e25 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -1087,11 +1087,10 @@ void MemcheckTool::setBusyCursor(bool busy) } MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl) - : ValgrindToolRunner(runControl) + : ValgrindToolRunner(runControl, Tr::tr("Analyzing Memory")) , m_withGdb(runControl->runMode() == MEMCHECK_WITH_GDB_RUN_MODE) { setId("MemcheckToolRunner"); - setProgressTitle(Tr::tr("Analyzing Memory")); connect(&m_runner, &ValgrindProcess::error, dd, &MemcheckTool::parserError); diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index ecaa0a723db..a90698a47ce 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -22,8 +22,9 @@ using namespace ProjectExplorer; namespace Valgrind::Internal { -ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl) +ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl, const QString &progressTitle) : RunWorker(runControl) + , m_progressTitle(progressTitle) { runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR); diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index 1b1dd2b9239..302f8e7a83f 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -15,13 +15,13 @@ namespace Valgrind::Internal { class ValgrindToolRunner : public ProjectExplorer::RunWorker { public: - explicit ValgrindToolRunner(ProjectExplorer::RunControl *runControl); + explicit ValgrindToolRunner(ProjectExplorer::RunControl *runControl, + const QString &progressTitle); void start() override; void stop() override; protected: - void setProgressTitle(const QString &title) { m_progressTitle = title; } virtual void addToolArguments(Utils::CommandLine &cmd) const = 0; ValgrindSettings m_settings{false};