Valgrind: Replace virtual method with setter

Change-Id: Ice8e426b39368caf0df8f7400eb56d3d86c0c0e5
cristianadam · Feb 7, 2025 · c16542a · c16542a
1 parent e218d37
commit c16542a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
@@ -30,6 +30,7 @@ CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl)
     : ValgrindToolRunner(runControl)
 {
     setId("CallgrindToolRunner");
+    setProgressTitle(Tr::tr("Profiling"));
 
     connect(&m_runner, &ValgrindProcess::valgrindStarted, this, [this](qint64 pid) {
         m_pid = pid;
@@ -77,11 +78,6 @@ void CallgrindToolRunner::addToolArguments(CommandLine &cmd) const
     cmd.addArgs(m_settings.callgrindArguments(), CommandLine::Raw);
 }
 
-QString CallgrindToolRunner::progressTitle() const
-{
-    return Tr::tr("Profiling");
-}
-
 void CallgrindToolRunner::start()
 {
     const FilePath executable = runControl()->commandLine().executable();

diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h
@@ -47,7 +47,6 @@ class CallgrindToolRunner : public ValgrindToolRunner
 
 protected:
     void addToolArguments(Utils::CommandLine &cmd) const override;
-    QString progressTitle() const override;
 
 signals:
     void parserDataReady(const Callgrind::ParseDataPtr &data);

diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
@@ -106,7 +106,6 @@ class MemcheckToolRunner final : public ValgrindToolRunner
     void parserError(const Valgrind::XmlProtocol::Error &error);
 
 private:
-    QString progressTitle() const final;
     void addToolArguments(CommandLine &cmd) const final;
 
     void startDebugger(qint64 valgrindPid);
@@ -116,11 +115,6 @@ class MemcheckToolRunner final : public ValgrindToolRunner
     std::unique_ptr<Process> m_process;
 };
 
-QString MemcheckToolRunner::progressTitle() const
-{
-    return Tr::tr("Analyzing Memory");
-}
-
 void MemcheckToolRunner::start()
 {
     if (runControl()->device()->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
@@ -1120,6 +1114,8 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
     , m_withGdb(runControl->runMode() == MEMCHECK_WITH_GDB_RUN_MODE)
 {
     setId("MemcheckToolRunner");
+    setProgressTitle(Tr::tr("Analyzing Memory"));
+
     connect(&m_runner, &ValgrindProcess::error, this, &MemcheckToolRunner::parserError);
 
     if (m_withGdb) {

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
@@ -57,7 +57,7 @@ void ValgrindToolRunner::start()
 
     using namespace std::chrono_literals;
     FutureProgress *fp
-        = ProgressManager::addTimedTask(m_progress, progressTitle(), "valgrind", 100s);
+        = ProgressManager::addTimedTask(m_progress, m_progressTitle, "valgrind", 100s);
     connect(fp, &FutureProgress::canceled,
             this, &ValgrindToolRunner::handleProgressCanceled);
     connect(fp, &FutureProgress::finished,

diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
@@ -21,7 +21,7 @@ class ValgrindToolRunner : public ProjectExplorer::RunWorker
     void stop() override;
 
 protected:
-    virtual QString progressTitle() const = 0;
+    void setProgressTitle(const QString &title) { m_progressTitle = title; }
     virtual void addToolArguments(Utils::CommandLine &cmd) const = 0;
 
     ValgrindSettings m_settings{false};
@@ -39,6 +39,7 @@ class ValgrindToolRunner : public ProjectExplorer::RunWorker
 
 private:
     bool m_isStopping = false;
+    QString m_progressTitle;
 };
 
 } // Valgrind::Internal