Skip to content

Commit d59abfd

Browse files
authored
fixed clang-tidy warnings (#3006)
* clang_tidy.cmake: added clang-tidy-11 to list of executables to look for * .clang-tidy: disabled warnings we are (currently) not interested in * fixed clang-tidy warnings
1 parent fbf5858 commit d59abfd

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
Checks: '*,-abseil-*,-android-*,-cert-*,-cppcoreguidelines-*,-fuchsia-*,-google-*,-hicpp-*,-llvm-*,-llvmlibc-*,-linuxkernel-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,-readability-braces-around-statements,-readability-magic-numbers,-bugprone-macro-parentheses,-readability-isolate-declaration,-readability-function-size,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-uppercase-literal-suffix,-modernize-use-auto,-readability-else-after-return,-modernize-use-default-member-init,-readability-named-parameter,-readability-redundant-member-init,-performance-faster-string-find,-modernize-avoid-c-arrays,-modernize-use-equals-default,-modernize-use-using,-readability-container-size-empty,-readability-simplify-boolean-expr,-modernize-use-override,-modernize-pass-by-value,-bugprone-branch-clone,-bugprone-narrowing-conversions,-modernize-raw-string-literal,-readability-convert-member-functions-to-static,-modernize-loop-convert,-misc-unused-using-decls,-modernize-use-emplace,-readability-const-return-type,-performance-unnecessary-value-param,-modernize-return-braced-init-list,-performance-inefficient-string-concatenation,-performance-for-range-copy,-misc-throw-by-value-catch-by-reference,-readability-avoid-const-params-in-decls,-readability-redundant-control-flow,-bugprone-argument-comment,-readability-non-const-parameter,-misc-non-private-member-variables-in-classes,-bugprone-suspicious-string-compare,-bugprone-use-after-move,-readability-misleading-indentation,-misc-unused-parameters-,-clang-analyzer-*,-bugprone-signed-char-misuse,-readability-make-member-function-const,-readability-inconsistent-declaration-parameter-name'
2+
Checks: '*,-abseil-*,-android-*,-cert-*,-cppcoreguidelines-*,-fuchsia-*,-google-*,-hicpp-*,-linuxkernel-*,-llvm-*,-llvmlibc-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,-readability-braces-around-statements,-readability-magic-numbers,-bugprone-macro-parentheses,-readability-isolate-declaration,-readability-function-size,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-uppercase-literal-suffix,-modernize-use-auto,-readability-else-after-return,-modernize-use-default-member-init,-readability-named-parameter,-readability-redundant-member-init,-performance-faster-string-find,-modernize-avoid-c-arrays,-modernize-use-equals-default,-modernize-use-using,-readability-container-size-empty,-readability-simplify-boolean-expr,-modernize-use-override,-modernize-pass-by-value,-bugprone-branch-clone,-bugprone-narrowing-conversions,-modernize-raw-string-literal,-readability-convert-member-functions-to-static,-modernize-loop-convert,-misc-unused-using-decls,-modernize-use-emplace,-readability-const-return-type,-performance-unnecessary-value-param,-modernize-return-braced-init-list,-performance-inefficient-string-concatenation,-performance-for-range-copy,-misc-throw-by-value-catch-by-reference,-readability-avoid-const-params-in-decls,-readability-redundant-control-flow,-bugprone-argument-comment,-readability-non-const-parameter,-misc-non-private-member-variables-in-classes,-bugprone-suspicious-string-compare,-bugprone-use-after-move,-readability-misleading-indentation,-misc-unused-parameters-,-clang-analyzer-*,-bugprone-signed-char-misuse,-readability-make-member-function-const,-readability-inconsistent-declaration-parameter-name,-misc-no-recursion,-readability-use-anyofallof,-performance-no-automatic-move'
33
CheckOptions:
44
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
55
value: '1'

cmake/clang_tidy.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-10 clang-tidy-9 clang-tidy-8)
1+
find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-11 clang-tidy-10 clang-tidy-9 clang-tidy-8)
22
message(STATUS "CLANG_TIDY=${CLANG_TIDY}")
33
if (CLANG_TIDY)
44
set(CLANG_TIDY_SRCS ${CMAKE_SOURCE_DIR}/cli/*.cpp ${CMAKE_SOURCE_DIR}/lib/*.cpp)

gui/resultsview.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void ResultsView::setAddedVariableContracts(const QStringList &added)
115115
mUI.mListAddedVariables->clear();
116116
mUI.mListAddedVariables->addItems(added);
117117
for (const QString& var: added) {
118-
for (auto item: mUI.mListMissingVariables->findItems(var, Qt::MatchExactly))
118+
for (auto *item: mUI.mListMissingVariables->findItems(var, Qt::MatchExactly))
119119
delete item;
120120
mVariableContracts.insert(var);
121121
}
@@ -549,11 +549,11 @@ void ResultsView::variableDoubleClicked(QListWidgetItem* item)
549549

550550
void ResultsView::editVariablesFilter(const QString &text)
551551
{
552-
for (auto item: mUI.mListAddedVariables->findItems(".*", Qt::MatchRegExp)) {
552+
for (auto *item: mUI.mListAddedVariables->findItems(".*", Qt::MatchRegExp)) {
553553
QString varname = item->text().mid(0, item->text().indexOf(" "));
554554
item->setHidden(!varname.contains(text));
555555
}
556-
for (auto item: mUI.mListMissingVariables->findItems(".*", Qt::MatchRegExp))
556+
for (auto *item: mUI.mListMissingVariables->findItems(".*", Qt::MatchRegExp))
557557
item->setHidden(!item->text().contains(text));
558558
}
559559

@@ -578,7 +578,7 @@ bool ResultsView::eventFilter(QObject *target, QEvent *event)
578578
if (target == mUI.mListAddedVariables) {
579579
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
580580
if (keyEvent->key() == Qt::Key_Delete) {
581-
for (auto i: mUI.mListAddedVariables->selectedItems()) {
581+
for (auto *i: mUI.mListAddedVariables->selectedItems()) {
582582
emit deleteVariableContract(i->text().mid(0, i->text().indexOf(" ")));
583583
delete i;
584584
}
@@ -589,7 +589,7 @@ bool ResultsView::eventFilter(QObject *target, QEvent *event)
589589
if (target == mUI.mListAddedContracts) {
590590
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
591591
if (keyEvent->key() == Qt::Key_Delete) {
592-
for (auto i: mUI.mListAddedContracts->selectedItems()) {
592+
for (auto *i: mUI.mListAddedContracts->selectedItems()) {
593593
emit deleteFunctionContract(i->text());
594594
delete i;
595595
}

lib/ctu.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static std::list<std::pair<const Token *, MathLib::bigint>> getUnsafeFunction(co
445445
return ret;
446446
}
447447

448-
std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok, MathLib::bigint *_value))
448+
std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok, MathLib::bigint *value))
449449
{
450450
std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
451451

@@ -461,8 +461,8 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer *token
461461
for (int argnr = 0; argnr < function->argCount(); ++argnr) {
462462
for (const std::pair<const Token *, MathLib::bigint> &v : getUnsafeFunction(tokenizer, settings, &scope, argnr, check, isUnsafeUsage)) {
463463
const Token *tok = v.first;
464-
MathLib::bigint value = v.second;
465-
unsafeUsage.emplace_back(CTU::getFunctionId(tokenizer, function), argnr+1, tok->str(), CTU::FileInfo::Location(tokenizer,tok), value);
464+
MathLib::bigint val = v.second;
465+
unsafeUsage.emplace_back(CTU::getFunctionId(tokenizer, function), argnr+1, tok->str(), CTU::FileInfo::Location(tokenizer,tok), val);
466466
}
467467
}
468468
}

lib/templatesimplifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ static bool areAllParamsTypes(const std::vector<const Token *> &params)
702702
if (params.empty())
703703
return false;
704704

705-
for (auto param : params) {
705+
for (const auto *param : params) {
706706
if (!Token::Match(param->previous(), "typename|class %name% ,|>"))
707707
return false;
708708
}

lib/tokenize.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,10 +2243,10 @@ bool Tokenizer::simplifyUsing()
22432243
std::string::size_type spaceIdx = 0;
22442244
std::string::size_type startIdx = 0;
22452245
while ((spaceIdx = removed1.find(" ", startIdx)) != std::string::npos) {
2246-
tok1->previous()->insertToken(removed1.substr(startIdx, spaceIdx - startIdx).c_str());
2246+
tok1->previous()->insertToken(removed1.substr(startIdx, spaceIdx - startIdx));
22472247
startIdx = spaceIdx + 1;
22482248
}
2249-
tok1->previous()->insertToken(removed1.substr(startIdx).c_str());
2249+
tok1->previous()->insertToken(removed1.substr(startIdx));
22502250
tok1->previous()->insertToken("::");
22512251
break;
22522252
}
@@ -5255,7 +5255,7 @@ void Tokenizer::splitTemplateRightAngleBrackets(bool check)
52555255
vars.insert(tok->strAt(2));
52565256

52575257
// Ticket #6181: normalize C++11 template parameter list closing syntax
5258-
if (tok->previous() && tok->str() == "<" && mTemplateSimplifier->templateParameters(tok) && vars.find(tok->previous()->str()) == vars.end()) {
5258+
if (tok->previous() && tok->str() == "<" && TemplateSimplifier::templateParameters(tok) && vars.find(tok->previous()->str()) == vars.end()) {
52595259
Token *endTok = tok->findClosingBracket();
52605260
if (check) {
52615261
if (Token::Match(endTok, ">>|>>="))

lib/valueflow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ static const std::string& invertAssign(const std::string& assign)
18211821
static std::unordered_map<std::string, std::string> lookup = {
18221822
{"+=", "-="}, {"-=", "+="}, {"*=", "/="}, {"/=", "*="}, {"<<=", ">>="}, {">>=", "<<="}, {"^=", "^="}
18231823
};
1824-
static std::string empty = "";
1824+
static std::string empty;
18251825
auto it = lookup.find(assign);
18261826
if (it == lookup.end())
18271827
return empty;

0 commit comments

Comments
 (0)