From a931ebf1e51149472aedba69d9b27d23c181c062 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 28 Sep 2023 16:50:53 +0200
Subject: [PATCH] ProjectExplorer: Simplify gcc options re-interpretation
 interface

Change-Id: I6fc293389e301d7ec36a897c856a0e2d57e35964
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/gcctoolchain.cpp | 14 ++++++--------
 src/plugins/projectexplorer/gcctoolchain.h   |  5 -----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 53e65a3acb1..f73e996b173 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -662,11 +662,10 @@ FilePaths GccToolChain::includedFiles(const QStringList &flags, const FilePath &
     return ToolChain::includedFiles("-include", flags, directoryPath, PossiblyConcatenatedFlag::No);
 }
 
-QStringList GccToolChain::gccPrepareArguments(const QStringList &flags,
-                                              const FilePath &sysRoot,
-                                              const QStringList &platformCodeGenFlags,
-                                              Id languageId,
-                                              OptionsReinterpreter reinterpretOptions)
+static QStringList gccPrepareArguments(const QStringList &flags,
+                                       const FilePath &sysRoot,
+                                       const QStringList &platformCodeGenFlags,
+                                       Id languageId)
 {
     QStringList arguments;
     const bool hasKitSysroot = !sysRoot.isEmpty();
@@ -677,7 +676,6 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags,
     allFlags << platformCodeGenFlags << flags;
     arguments += filteredFlags(allFlags, !hasKitSysroot);
     arguments << languageOption(languageId) << "-E" << "-v" << "-";
-    arguments = reinterpretOptions(arguments);
 
     return arguments;
 }
@@ -702,8 +700,8 @@ HeaderPaths GccToolChain::builtInHeaderPaths(const Environment &env,
     QStringList arguments = gccPrepareArguments(flags,
                                                 sysRoot,
                                                 platformCodeGenFlags,
-                                                languageId,
-                                                reinterpretOptions);
+                                                languageId);
+    arguments = reinterpretOptions(arguments);
 
     // Must be clang case only.
     if (!originalTargetTriple.isEmpty())
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 5ed17857eaf..853b61add12 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -146,11 +146,6 @@ protected:
 private:
     void syncAutodetectedWithParentToolchains();
     void updateSupportedAbis() const;
-    static QStringList gccPrepareArguments(const QStringList &flags,
-                                           const Utils::FilePath &sysRoot,
-                                           const QStringList &platformCodeGenFlags,
-                                           Utils::Id languageId,
-                                           OptionsReinterpreter reinterpretOptions);
 
 protected:
     QStringList m_platformCodeGenFlags;