feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTool: Sanitize style

Browse Source 
The string is passed further on as char * anyway, no need for
templates here.

Change-Id: I9305225f96111c0e9228d372e1231846099a9ecc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
hjk
2019-06-12 08:30:33 +02:00
parent d747be71f5
commit 309c644466
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clangtools/clangtoolruncontrol.cpp
View File

@@ -81,8 +81,7 @@ static QStringList splitArgs(QString &argsString)
return result; return result;
} }
template<size_t Size> static QStringList extraOptions(const char *environment)
static QStringList extraOptions(const char(&environment)[Size])
{ {
if (!qEnvironmentVariableIsSet(environment)) if (!qEnvironmentVariableIsSet(environment))
return QStringList(); return QStringList();
@@ -90,7 +89,8 @@ static QStringList extraOptions(const char(&environment)[Size])
return splitArgs(arguments); return splitArgs(arguments);
} }
static QStringList extraClangToolsPrependOptions() { static QStringList extraClangToolsPrependOptions()
{
constexpr char csaPrependOptions[] = "QTC_CLANG_CSA_CMD_PREPEND"; constexpr char csaPrependOptions[] = "QTC_CLANG_CSA_CMD_PREPEND";
constexpr char toolsPrependOptions[] = "QTC_CLANG_TOOLS_CMD_PREPEND"; constexpr char toolsPrependOptions[] = "QTC_CLANG_TOOLS_CMD_PREPEND";
static const QStringList options = extraOptions(csaPrependOptions) static const QStringList options = extraOptions(csaPrependOptions)
@@ -100,7 +100,8 @@ static QStringList extraClangToolsPrependOptions() {
return options; return options;
} }
static QStringList extraClangToolsAppendOptions() { static QStringList extraClangToolsAppendOptions()
{
constexpr char csaAppendOptions[] = "QTC_CLANG_CSA_CMD_APPEND"; constexpr char csaAppendOptions[] = "QTC_CLANG_CSA_CMD_APPEND";
constexpr char toolsAppendOptions[] = "QTC_CLANG_TOOLS_CMD_APPEND"; constexpr char toolsAppendOptions[] = "QTC_CLANG_TOOLS_CMD_APPEND";
static const QStringList options = extraOptions(csaAppendOptions) static const QStringList options = extraOptions(csaAppendOptions)
@@ -216,14 +217,14 @@ AnalyzeUnits ClangToolRunControl::unitsToAnalyze()
static QDebug operator<<(QDebug debug, const Utils::Environment &environment) static QDebug operator<<(QDebug debug, const Utils::Environment &environment)
{ {
foreach (const QString &entry, environment.toStringList()) for (const QString &entry : environment.toStringList())
debug << "\n " << entry; debug << "\n " << entry;
return debug; return debug;
} }
static QDebug operator<<(QDebug debug, const AnalyzeUnits &analyzeUnits) static QDebug operator<<(QDebug debug, const AnalyzeUnits &analyzeUnits)
{ {
foreach (const AnalyzeUnit &unit, analyzeUnits) for (const AnalyzeUnit &unit : analyzeUnits)
debug << "\n " << unit.file; debug << "\n " << unit.file;
return debug; return debug;
} }
@@ -385,8 +386,7 @@ void ClangToolRunControl::analyzeNextFile()
m_runners.insert(runner); m_runners.insert(runner);
QTC_ASSERT(runner->run(unit.file, unit.arguments), return); QTC_ASSERT(runner->run(unit.file, unit.arguments), return);
appendMessage(tr("Analyzing \"%1\".").arg( appendMessage(tr("Analyzing \"%1\".").arg(FilePath::fromString(unit.file).toUserOutput()),
Utils::FilePath::fromString(unit.file).toUserOutput()),
Utils::StdOutFormat); Utils::StdOutFormat);
} }