ClangToolRunner: Get rid of ArgsCreator

Now we have all the data available so there is not need
to postpone the creation of arguments.

Change-Id: Iec10f5715d6f572c9a8fde63c8c6d3f96f894b47
Reviewed-by: David Schulz <[email protected]>
Reviewed-by: <[email protected]>

2 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index a92673a783c..b441ad51f81 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -85,12 +85,6 @@ ClangToolRunner::ClangToolRunner(const AnalyzeInputData &input, QObject *parent)
 {
     m_name = input.tool == ClangToolType::Tidy ? tr("Clang-Tidy") : tr("Clazy");
     m_executable = toolExecutable(input.tool);
-    m_argsCreator = [this, input](const QStringList &baseOptions) {
-        return QStringList() << checksArguments(input.tool, input.config)
-                             << mainToolArguments()
-                             << "--"
-                             << clangArguments(input.config, baseOptions);
-    };
     QTC_CHECK(!m_input.outputDirPath.isEmpty());
 
     m_process.setEnvironment(input.environment);
@@ -146,7 +140,12 @@ bool ClangToolRunner::run()
 
     m_outputFilePath = createOutputFilePath(m_input.outputDirPath, m_input.unit.file);
     QTC_ASSERT(!m_outputFilePath.isEmpty(), return false);
-    const CommandLine commandLine = {m_executable, m_argsCreator(m_input.unit.arguments)};
+
+    const QStringList args = checksArguments(m_input.tool, m_input.config)
+                           + mainToolArguments()
+                           + QStringList{"--"}
+                           + clangArguments(m_input.config, m_input.unit.arguments);
+    const CommandLine commandLine = {m_executable, args};
 
     qCDebug(LOG).noquote() << "Starting" << commandLine.toUserOutput();
     m_process.setCommand(commandLine);
diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h
index c3974a47f84..f56c49c0f32 100644
--- a/src/plugins/clangtools/clangtoolrunner.h
+++ b/src/plugins/clangtools/clangtoolrunner.h
@@ -15,8 +15,6 @@
 namespace ClangTools {
 namespace Internal {
 
-using ArgsCreator = std::function<QStringList(const QStringList &baseOptions)>;
-
 struct AnalyzeInputData
 {
     CppEditor::ClangToolType tool = CppEditor::ClangToolType::Tidy;
@@ -60,7 +58,6 @@ private:
 
     QString m_name;
     Utils::FilePath m_executable;
-    ArgsCreator m_argsCreator;
 
     QString m_outputFilePath;
 };