From 9dd5fddffe7bd36df5ef1e105dc59ed71b600762 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 19 Feb 2025 18:07:57 +0100
Subject: [PATCH] Valgrind: Inline genericToolArguments()

And simplify it a bit.

Change-Id: I22dfff35518d3e6642ce792f23eac0e4b3d3bdc1
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/valgrind/valgrindengine.cpp | 35 +++++++++----------------
 src/plugins/valgrind/valgrindengine.h   |  3 ---
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index a90698a47ce..6b16bc77e96 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -64,6 +64,17 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl, const QString &pr
     });
 }
 
+static QString selfModifyingCodeDetectionToString(int detection)
+{
+    switch (detection) {
+    case ValgrindSettings::DetectSmcNo:                return "none";
+    case ValgrindSettings::DetectSmcEverywhere:        return "all";
+    case ValgrindSettings::DetectSmcEverywhereButFile: return "all-non-file";
+    case ValgrindSettings::DetectSmcStackOnly:         return "stack";
+    }
+    return {};
+}
+
 void ValgrindToolRunner::start()
 {
     FilePath valgrindExecutable = m_settings.valgrindExecutable();
@@ -93,7 +104,7 @@ void ValgrindToolRunner::start()
 
     CommandLine valgrind{valgrindExecutable};
     valgrind.addArgs(m_settings.valgrindArguments(), CommandLine::Raw);
-    valgrind.addArgs(genericToolArguments());
+    valgrind.addArg("--smc-check=" + selfModifyingCodeDetectionToString(m_settings.selfModifyingCodeDetection()));
     addToolArguments(valgrind);
 
     m_runner.setValgrindCommand(valgrind);
@@ -117,26 +128,4 @@ void ValgrindToolRunner::stop()
     appendMessage(Tr::tr("Terminating process..."), ErrorMessageFormat);
 }
 
-QStringList ValgrindToolRunner::genericToolArguments() const
-{
-    QString smcCheckValue;
-
-    switch (m_settings.selfModifyingCodeDetection()) {
-    case ValgrindSettings::DetectSmcNo:
-        smcCheckValue = "none";
-        break;
-    case ValgrindSettings::DetectSmcEverywhere:
-        smcCheckValue = "all";
-        break;
-    case ValgrindSettings::DetectSmcEverywhereButFile:
-        smcCheckValue = "all-non-file";
-        break;
-    case ValgrindSettings::DetectSmcStackOnly:
-    default:
-        smcCheckValue = "stack";
-        break;
-    }
-    return {"--smc-check=" + smcCheckValue};
-}
-
 } // Valgrid::Internal
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index 302f8e7a83f..ebbf4200810 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -27,9 +27,6 @@ protected:
     ValgrindSettings m_settings{false};
     ValgrindProcess m_runner;
 
-private:
-    QStringList genericToolArguments() const;
-
 private:
     QString m_progressTitle;
     QFutureInterface<void> m_progress;