From 1976630bbce933901456584b54af56724f22e29d Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 31 May 2022 09:17:50 +0200 Subject: Valgrind: Inline ValgrindToolRunner::executable Change-Id: Ia714a5a322ae56b07360871f584ec6f9f1babb5b Reviewed-by: Jarek Kobus --- src/plugins/valgrind/callgrindengine.cpp | 6 +++--- src/plugins/valgrind/memchecktool.cpp | 2 +- src/plugins/valgrind/valgrindengine.cpp | 5 ----- src/plugins/valgrind/valgrindengine.h | 2 -- 4 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp index 21448de4b73..333d713e15b 100644 --- a/src/plugins/valgrind/callgrindengine.cpp +++ b/src/plugins/valgrind/callgrindengine.cpp @@ -25,7 +25,6 @@ #include "callgrindengine.h" -#include "callgrindtool.h" #include "valgrindsettings.h" #include @@ -105,7 +104,7 @@ QStringList CallgrindToolRunner::toolArguments() const arguments << "--callgrind-out-file=" + m_valgrindOutputFile.path(); - arguments << Utils::ProcessArgs::splitArgs(m_settings.callgrindArguments.value()); + arguments << ProcessArgs::splitArgs(m_settings.callgrindArguments.value()); return arguments; } @@ -117,7 +116,8 @@ QString CallgrindToolRunner::progressTitle() const void CallgrindToolRunner::start() { - appendMessage(tr("Profiling %1").arg(executable().toUserOutput()), Utils::NormalMessageFormat); + const FilePath executable = runControl()->commandLine().executable(); + appendMessage(tr("Profiling %1").arg(executable.toUserOutput()), NormalMessageFormat); return ValgrindToolRunner::start(); } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 3ba61a556bc..1fedbcb4a1e 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -1008,7 +1008,7 @@ void MemcheckToolPrivate::setupRunner(MemcheckToolRunner *runTool) m_loadExternalLogFile->setDisabled(true); const FilePath dir = runControl->project()->projectDirectory(); - const QString name = runTool->executable().fileName(); + const QString name = runControl->commandLine().executable().fileName(); m_errorView->setDefaultSuppressionFile(dir.pathAppended(name + ".supp")); diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index a1be3bd4650..a6a21e7dcb5 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -122,11 +122,6 @@ void ValgrindToolRunner::stop() m_runner.stop(); } -FilePath ValgrindToolRunner::executable() const -{ - return runControl()->commandLine().executable(); -} - QStringList ValgrindToolRunner::genericToolArguments() const { QString smcCheckValue; diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index 4eb3a119a4c..06e767b7629 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -47,8 +47,6 @@ public: void start() override; void stop() override; - Utils::FilePath executable() const; - protected: virtual QString progressTitle() const = 0; virtual QStringList toolArguments() const = 0; -- cgit v1.2.3