From a9c675d88d2a5eb030179dbd87103148ca56cc7a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 11 Jan 2023 21:11:02 +0100 Subject: [PATCH] ClangToolRunWorker: Move logging of started tools into runner creator Runner creator is being called just before it's about to be run. Get rid of unneeded ClangToolRunner::fileToAnalyze() now. Change-Id: I51e49597f38919a7174495df3db6b2adc5109a21 Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolruncontrol.cpp | 11 ++++------- src/plugins/clangtools/clangtoolrunner.h | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index b4320610017..7482868b3f3 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -265,15 +265,9 @@ void ClangToolRunWorker::analyzeNextFile() } const RunnerCreator runnerCreator = m_runnerCreators.takeFirst(); - ClangToolRunner *runner = runnerCreator(); m_runners.insert(runner); - - if (runner->run()) { - const QString filePath = FilePath::fromString(runner->fileToAnalyze()).toUserOutput(); - appendMessage(tr("Analyzing \"%1\" [%2].").arg(filePath, runner->name()), - Utils::StdOutFormat); - } else { + if (!runner->run()) { reportFailure(tr("Failed to start runner \"%1\".").arg(runner->name())); stop(); } @@ -374,6 +368,9 @@ ClangToolRunner *ClangToolRunWorker::createRunner(ClangToolType tool, const Anal onDone(output); handleFinished(runner); }); + const QString filePath = FilePath::fromString(unit.file).toUserOutput(); + appendMessage(tr("Analyzing \"%1\" [%2].").arg(filePath, runner->name()), + Utils::StdOutFormat); return runner; } diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h index dc761863fa7..37f6bdf915a 100644 --- a/src/plugins/clangtools/clangtoolrunner.h +++ b/src/plugins/clangtools/clangtoolrunner.h @@ -53,7 +53,6 @@ public: ClangToolRunner(const AnalyzeInputData &input, QObject *parent = nullptr); QString name() const { return m_name; } - QString fileToAnalyze() const { return m_input.unit.file; } // compilerOptions is expected to contain everything except: // (1) file to analyze