From 9a82846de497d1959b1507ea2ffa4d6530e69ae9 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 2 Jul 2021 07:12:33 +0200 Subject: [PATCH] ClangTools: Use FilePath in ClangToolRunner::init() One .path().path() less. Change-Id: Ibf1b25acefafc1bb5359d839ebf272c3d1fb08d6 Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolruncontrol.cpp | 2 +- src/plugins/clangtools/clangtoolrunner.cpp | 11 +++++------ src/plugins/clangtools/clangtoolrunner.h | 4 ++-- src/plugins/clangtools/documentclangtoolrunner.cpp | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 31c2a37655a..4a8cbcfbf4b 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -445,7 +445,7 @@ template ClangToolRunner *ClangToolRunWorker::createRunner() { auto runner = new T(m_diagnosticConfig, this); - runner->init(m_temporaryDir.path().path(), m_environment); + runner->init(m_temporaryDir.path(), m_environment); connect(runner, &ClangToolRunner::finishedWithSuccess, this, &ClangToolRunWorker::onRunnerFinishedWithSuccess); connect(runner, &ClangToolRunner::finishedWithFailure, diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index 976091322ea..8b25eccb960 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -78,7 +78,7 @@ ClangToolRunner::~ClangToolRunner() m_process->deleteLater(); } -void ClangToolRunner::init(const QString &outputDirPath, const Environment &environment) +void ClangToolRunner::init(const FilePath &outputDirPath, const Environment &environment) { m_outputDirPath = outputDirPath; QTC_CHECK(!m_outputDirPath.isEmpty()); @@ -112,15 +112,14 @@ bool ClangToolRunner::supportsVFSOverlay() const return it.value(); } -static QString createOutputFilePath(const QString &dirPath, const QString &fileToAnalyze) +static QString createOutputFilePath(const FilePath &dirPath, const QString &fileToAnalyze) { const QString fileName = QFileInfo(fileToAnalyze).fileName(); - const QString fileTemplate = dirPath - + QLatin1String("/report-") + fileName + QLatin1String("-XXXXXX"); + const FilePath fileTemplate = dirPath.pathAppended("report-" + fileName + "-XXXXXX"); - Utils::TemporaryFile temporaryFile("clangtools"); + TemporaryFile temporaryFile("clangtools"); temporaryFile.setAutoRemove(false); - temporaryFile.setFileTemplate(fileTemplate); + temporaryFile.setFileTemplate(fileTemplate.path()); if (temporaryFile.open()) { temporaryFile.close(); return temporaryFile.fileName(); diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h index 811d360508a..3f05d9392e6 100644 --- a/src/plugins/clangtools/clangtoolrunner.h +++ b/src/plugins/clangtools/clangtoolrunner.h @@ -44,7 +44,7 @@ public: ClangToolRunner(QObject *parent = nullptr); ~ClangToolRunner() override; - void init(const QString &outputDirPath, const Utils::Environment &environment); + void init(const Utils::FilePath &outputDirPath, const Utils::Environment &environment); void setName(const QString &name) { m_name = name; } void setExecutable(const QString &executable) { m_executable = executable; } void setArgsCreator(const ArgsCreator &argsCreator) { m_argsCreator = argsCreator; } @@ -79,7 +79,7 @@ private: QString commandlineAndOutput() const; private: - QString m_outputDirPath; + Utils::FilePath m_outputDirPath; Utils::QtcProcess *m_process = nullptr; QString m_name; diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp index 93bcaa7746e..89d76e0f559 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.cpp +++ b/src/plugins/clangtools/documentclangtoolrunner.cpp @@ -391,7 +391,7 @@ ClangToolRunner *DocumentClangToolRunner::createRunner(const CppTools::ClangDiag const Utils::Environment &env) { auto runner = new T(config, this); - runner->init(m_temporaryDir.path().path(), env); + runner->init(m_temporaryDir.path(), env); connect(runner, &ClangToolRunner::finishedWithSuccess, this, &DocumentClangToolRunner::onSuccess); connect(runner, &ClangToolRunner::finishedWithFailure,