From 309c644466f334182af4899b369b1ba0c3d7ef48 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 12 Jun 2019 08:30:33 +0200 Subject: [PATCH] ClangTool: Sanitize style The string is passed further on as char * anyway, no need for templates here. Change-Id: I9305225f96111c0e9228d372e1231846099a9ecc Reviewed-by: Nikolai Kosjar --- src/plugins/clangtools/clangtoolruncontrol.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 2ff19c620e9..b1572b0010b 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -81,8 +81,7 @@ static QStringList splitArgs(QString &argsString) return result; } -template -static QStringList extraOptions(const char(&environment)[Size]) +static QStringList extraOptions(const char *environment) { if (!qEnvironmentVariableIsSet(environment)) return QStringList(); @@ -90,7 +89,8 @@ static QStringList extraOptions(const char(&environment)[Size]) return splitArgs(arguments); } -static QStringList extraClangToolsPrependOptions() { +static QStringList extraClangToolsPrependOptions() +{ constexpr char csaPrependOptions[] = "QTC_CLANG_CSA_CMD_PREPEND"; constexpr char toolsPrependOptions[] = "QTC_CLANG_TOOLS_CMD_PREPEND"; static const QStringList options = extraOptions(csaPrependOptions) @@ -100,7 +100,8 @@ static QStringList extraClangToolsPrependOptions() { return options; } -static QStringList extraClangToolsAppendOptions() { +static QStringList extraClangToolsAppendOptions() +{ constexpr char csaAppendOptions[] = "QTC_CLANG_CSA_CMD_APPEND"; constexpr char toolsAppendOptions[] = "QTC_CLANG_TOOLS_CMD_APPEND"; static const QStringList options = extraOptions(csaAppendOptions) @@ -216,14 +217,14 @@ AnalyzeUnits ClangToolRunControl::unitsToAnalyze() static QDebug operator<<(QDebug debug, const Utils::Environment &environment) { - foreach (const QString &entry, environment.toStringList()) + for (const QString &entry : environment.toStringList()) debug << "\n " << entry; return debug; } static QDebug operator<<(QDebug debug, const AnalyzeUnits &analyzeUnits) { - foreach (const AnalyzeUnit &unit, analyzeUnits) + for (const AnalyzeUnit &unit : analyzeUnits) debug << "\n " << unit.file; return debug; } @@ -385,8 +386,7 @@ void ClangToolRunControl::analyzeNextFile() m_runners.insert(runner); QTC_ASSERT(runner->run(unit.file, unit.arguments), return); - appendMessage(tr("Analyzing \"%1\".").arg( - Utils::FilePath::fromString(unit.file).toUserOutput()), + appendMessage(tr("Analyzing \"%1\".").arg(FilePath::fromString(unit.file).toUserOutput()), Utils::StdOutFormat); }