Skip to content

Commit

Permalink
fixed some clang-tidy warnings (#3080)
Browse files Browse the repository at this point in the history
  • Loading branch information
firewave committed May 8, 2022
1 parent eb9c4b4 commit c710335
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
@@ -1,5 +1,5 @@
---
Checks: '*,-abseil-*,-altera-*,-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,-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,-misc-throw-by-value-catch-by-reference,-readability-avoid-const-params-in-decls,-readability-non-const-parameter,-misc-non-private-member-variables-in-classes,-bugprone-suspicious-string-compare,-readability-misleading-indentation,-clang-analyzer-*,-bugprone-signed-char-misuse,-readability-make-member-function-const,-misc-no-recursion,-readability-use-anyofallof,-performance-no-automatic-move,-bugprone-suspicious-include,-modernize-replace-random-shuffle,-readability-function-cognitive-complexity,-readability-redundant-access-specifiers,-modernize-use-equals-delete,-performance-noexcept-move-constructor,-concurrency-mt-unsafe,-bugprone-easily-swappable-parameters,-readability-suspicious-call-argument'
Checks: '*,-abseil-*,-altera-*,-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,-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,-misc-throw-by-value-catch-by-reference,-readability-avoid-const-params-in-decls,-readability-non-const-parameter,-misc-non-private-member-variables-in-classes,-bugprone-suspicious-string-compare,-clang-analyzer-*,-bugprone-signed-char-misuse,-readability-make-member-function-const,-misc-no-recursion,-readability-use-anyofallof,-performance-no-automatic-move,-bugprone-suspicious-include,-modernize-replace-random-shuffle,-readability-function-cognitive-complexity,-readability-redundant-access-specifiers,-modernize-use-equals-delete,-performance-noexcept-move-constructor,-concurrency-mt-unsafe,-bugprone-easily-swappable-parameters,-readability-suspicious-call-argument'
WarningsAsErrors: '*'
CheckOptions:
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -32,6 +32,7 @@ tools/extracttests
*.suo
*.user
.vs/
UpgradeLog*.htm

# VS build folders
bin/
Expand Down
2 changes: 1 addition & 1 deletion gui/cppchecklibrarydata.cpp
Expand Up @@ -34,7 +34,7 @@ static std::string unhandledElement(const QXmlStreamReader &xmlReader)
throw std::runtime_error(QObject::tr("line %1: Unhandled element %2").arg(xmlReader.lineNumber()).arg(xmlReader.name().toString()).toStdString());
}

static std::string mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, QString attributeName)
static std::string mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, const QString& attributeName)
{
throw std::runtime_error(QObject::tr("line %1: Mandatory attribute '%2' missing in '%3'")
.arg(xmlReader.lineNumber())
Expand Down
2 changes: 1 addition & 1 deletion lib/path.cpp
Expand Up @@ -72,7 +72,7 @@ std::string Path::fromNativeSeparators(std::string path)

std::string Path::simplifyPath(std::string originalPath)
{
return simplecpp::simplifyPath(originalPath);
return simplecpp::simplifyPath(std::move(originalPath));
}

std::string Path::getPathFromFilename(const std::string &filename)
Expand Down
12 changes: 6 additions & 6 deletions lib/symboldatabase.cpp
Expand Up @@ -1310,20 +1310,20 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
void SymbolDatabase::createSymbolDatabaseEnums()
{
// fill in enumerators in enum
for (std::list<Scope>::iterator it = scopeList.begin(); it != scopeList.end(); ++it) {
if (it->type != Scope::eEnum)
for (Scope &scope : scopeList) {
if (scope.type != Scope::eEnum)
continue;

// add enumerators to enumerator tokens
for (Enumerator & i : it->enumeratorList)
for (Enumerator & i : scope.enumeratorList)
const_cast<Token *>(i.name)->enumerator(&i);
}

for (std::list<Scope>::iterator it = scopeList.begin(); it != scopeList.end(); ++it) {
if (it->type != Scope::eEnum)
for (Scope &scope : scopeList) {
if (scope.type != Scope::eEnum)
continue;

for (Enumerator & enumerator : it->enumeratorList) {
for (Enumerator & enumerator : scope.enumeratorList) {
// look for initialization tokens that can be converted to enumerators and convert them
if (enumerator.start) {
if (!enumerator.end)
Expand Down
4 changes: 2 additions & 2 deletions lib/tokenlist.cpp
Expand Up @@ -211,7 +211,7 @@ void TokenList::deleteTokens(Token *tok)
// add a token.
//---------------------------------------------------------------------------

void TokenList::addtoken(std::string str, const nonneg int lineno, const nonneg int column, const nonneg int fileno, bool split)
void TokenList::addtoken(const std::string& str, const nonneg int lineno, const nonneg int column, const nonneg int fileno, bool split)
{
if (str.empty())
return;
Expand Down Expand Up @@ -244,7 +244,7 @@ void TokenList::addtoken(std::string str, const nonneg int lineno, const nonneg
mTokensFrontBack.back->fileIndex(fileno);
}

void TokenList::addtoken(std::string str, const Token *locationTok)
void TokenList::addtoken(const std::string& str, const Token *locationTok)
{
if (str.empty())
return;
Expand Down
4 changes: 2 additions & 2 deletions lib/tokenlist.h
Expand Up @@ -70,8 +70,8 @@ class CPPCHECKLIB TokenList {
*/
static void deleteTokens(Token *tok);

void addtoken(std::string str, const nonneg int lineno, const nonneg int column, const nonneg int fileno, bool split = false);
void addtoken(std::string str, const Token *locationTok);
void addtoken(const std::string& str, const nonneg int lineno, const nonneg int column, const nonneg int fileno, bool split = false);
void addtoken(const std::string& str, const Token *locationTok);

void addtoken(const Token *tok, const nonneg int lineno, const nonneg int column, const nonneg int fileno);
void addtoken(const Token *tok, const Token *locationTok);
Expand Down
8 changes: 4 additions & 4 deletions lib/valueflow.cpp
Expand Up @@ -1807,15 +1807,15 @@ static void valueFlowGlobalStaticVar(TokenList *tokenList, const Settings *setti
static Analyzer::Result valueFlowForward(Token* startToken,
const Token* endToken,
const Token* exprTok,
std::list<ValueFlow::Value> values,
const std::list<ValueFlow::Value>& values,
TokenList* const tokenlist,
const Settings* settings);

static void valueFlowReverse(TokenList* tokenlist,
Token* tok,
const Token* const varToken,
ValueFlow::Value val,
ValueFlow::Value val2,
const ValueFlow::Value& val2,
ErrorLogger* errorLogger,
const Settings* settings);

Expand Down Expand Up @@ -3026,7 +3026,7 @@ ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, co
static Analyzer::Result valueFlowForward(Token* startToken,
const Token* endToken,
const Token* exprTok,
std::list<ValueFlow::Value> values,
const std::list<ValueFlow::Value>& values,
TokenList* const tokenlist,
const Settings* settings)
{
Expand Down Expand Up @@ -3067,7 +3067,7 @@ static void valueFlowReverse(TokenList* tokenlist,
Token* tok,
const Token* const varToken,
ValueFlow::Value val,
ValueFlow::Value val2,
const ValueFlow::Value& val2,
ErrorLogger* /*errorLogger*/,
const Settings* settings)
{
Expand Down
2 changes: 1 addition & 1 deletion tools/triage/mainwindow.cpp
Expand Up @@ -147,7 +147,7 @@ void MainWindow::refreshResults()
filter(ui->version->currentText());
}

void MainWindow::filter(QString filter)
void MainWindow::filter(const QString& filter)
{
QStringList allErrors;

Expand Down
2 changes: 1 addition & 1 deletion tools/triage/mainwindow.h
Expand Up @@ -42,7 +42,7 @@ class MainWindow : public QMainWindow {
public slots:
void loadFile();
void loadFromClipboard();
void filter(QString filter);
void filter(const QString& filter);
void showResult(QListWidgetItem *item);
void refreshResults();
void fileTreeFilter(const QString &str);
Expand Down

0 comments on commit c710335

Please sign in to comment.