enabled modernize-use-trailing-return-type clang-tidy check and fixed lamdba-related warnings only

Author: firewave

.clang-tidy

@@ -51,7 +51,6 @@ Checks: >
         -modernize-use-designated-initializers,
         -modernize-use-nodiscard,
         -modernize-use-scoped-lock,
-        -modernize-use-trailing-return-type,
         -performance-avoid-endl,
         -performance-inefficient-string-concatenation,
         -performance-no-automatic-move,

cli/cmdlineparser.cpp

@@ -189,7 +189,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 
     // Output a warning for the user if he tries to exclude headers
     const std::vector<std::string>& ignored = getIgnoredPaths();
-    const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) {
+    const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) -> bool {
         return Path::isHeader(i);
     });
     if (warn) {
@@ -210,7 +210,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         if (!mSettings.fileFilters.empty()) {
             // filter only for the selected filenames from all project files
             PathMatch filtermatcher(mSettings.fileFilters, Path::getCurrentPath());
-            std::copy_if(fileSettingsRef.cbegin(), fileSettingsRef.cend(), std::back_inserter(fileSettings), [&](const FileSettings &fs) {
+            std::copy_if(fileSettingsRef.cbegin(), fileSettingsRef.cend(), std::back_inserter(fileSettings), [&](const FileSettings &fs) -> bool {
                 return filtermatcher.match(fs.filename());
             });
             if (fileSettings.empty()) {
@@ -228,11 +228,11 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
 
         // sort the markup last
-        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
+        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) -> bool {
             return !mSettings.library.markupFile(fs.filename()) || !mSettings.library.processMarkupAfterCode(fs.filename());
         });
 
-        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
+        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) -> bool {
             return mSettings.library.markupFile(fs.filename()) && mSettings.library.processMarkupAfterCode(fs.filename());
         });
 
@@ -269,7 +269,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             while (it != filesResolved.end()) {
                 const std::string& name = it->path();
                 // TODO: log if duplicated files were dropped
-                filesResolved.erase(std::remove_if(std::next(it), filesResolved.end(), [&](const FileWithDetails& entry) {
+                filesResolved.erase(std::remove_if(std::next(it), filesResolved.end(), [&](const FileWithDetails& entry) -> bool {
                     return entry.path() == name;
                 }), filesResolved.end());
                 ++it;
@@ -292,11 +292,11 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         frontend::applyLang(files, mSettings, mEnforcedLang);
 
         // sort the markup last
-        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
+        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) -> bool {
             return !mSettings.library.markupFile(entry.path()) || !mSettings.library.processMarkupAfterCode(entry.path());
         });
 
-        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
+        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) -> bool {
             return mSettings.library.markupFile(entry.path()) && mSettings.library.processMarkupAfterCode(entry.path());
         });
 
@@ -2176,7 +2176,7 @@ std::list<FileWithDetails> CmdLineParser::filterFiles(const std::vector<std::str
                                                       const std::list<FileWithDetails>& filesResolved) {
     std::list<FileWithDetails> files;
     PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
-    std::copy_if(filesResolved.cbegin(), filesResolved.cend(), std::inserter(files, files.end()), [&](const FileWithDetails& entry) {
+    std::copy_if(filesResolved.cbegin(), filesResolved.cend(), std::inserter(files, files.end()), [&](const FileWithDetails& entry) -> bool {
         return filtermatcher.match(entry.path());
     });
     return files;

cli/cppcheckexecutor.cpp

@@ -416,7 +416,7 @@ int CppCheckExecutor::check_wrapper(const Settings& settings, Suppressions& supp
 
 bool CppCheckExecutor::reportSuppressions(const Settings &settings, const SuppressionList& suppressions, bool unusedFunctionCheckEnabled, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
     const auto& suppr = suppressions.getSuppressions();
-    if (std::any_of(suppr.begin(), suppr.end(), [](const SuppressionList::Suppression& s) {
+    if (std::any_of(suppr.begin(), suppr.end(), [](const SuppressionList::Suppression& s) -> bool {
         return s.errorId == "unmatchedSuppression" && s.fileName.empty() && s.lineNumber == SuppressionList::Suppression::NO_LINE;
     }))
         return false;
@@ -532,7 +532,7 @@ void StdLogger::writeCheckersReport(const Suppressions& supprs)
     CheckersReport checkersReport(mSettings, mActiveCheckers);
 
     const auto& suppressions = supprs.nomsg.getSuppressions();
-    const bool summarySuppressed = std::any_of(suppressions.cbegin(), suppressions.cend(), [](const SuppressionList::Suppression& s) {
+    const bool summarySuppressed = std::any_of(suppressions.cbegin(), suppressions.cend(), [](const SuppressionList::Suppression& s) -> bool {
         return s.errorId == "checkersReport";
     });
 

cli/filelister.cpp

@@ -294,7 +294,7 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     std::string err = addFiles2(filesSorted, corrected_path, extra, recursive, ignored, debug);
 
     // files need to be sorted as the filesystems dosn't provide a stable order
-    filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
+    filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) -> bool {
         return a.path() < b.path();
     });
     files.insert(files.end(), std::make_move_iterator(filesSorted.begin()), std::make_move_iterator(filesSorted.end()));

cli/singleexecutor.cpp

@@ -42,7 +42,7 @@ unsigned int SingleExecutor::check()
 {
     unsigned int result = 0;
 
-    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& f) {
+    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& f) -> std::size_t {
         return v + f.size();
     });
 

gui/checkthread.cpp

@@ -420,7 +420,7 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
             continue;
 
         std::list<ErrorMessage::FileLocation> callstack;
-        std::transform(e.errorPath.cbegin(), e.errorPath.cend(), std::back_inserter(callstack), [](const QErrorPathItem& path) {
+        std::transform(e.errorPath.cbegin(), e.errorPath.cend(), std::back_inserter(callstack), [](const QErrorPathItem& path) -> ErrorMessage::FileLocation {
             return ErrorMessage::FileLocation(path.file.toStdString(), path.info.toStdString(), path.line, path.column);
         });
         const std::string f0 = file0.toStdString();

gui/main.cpp

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 
     // Set data dir..
     const QStringList args = QApplication::arguments();
-    auto it = std::find_if(args.cbegin(), args.cend(), [](const QString& arg) {
+    auto it = std::find_if(args.cbegin(), args.cend(), [](const QString& arg) -> bool {
         return arg.startsWith("--data-dir=");
     });
     if (it != args.end()) {

gui/resultstree.cpp

@@ -811,15 +811,15 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 {
                     auto *action = new QAction(tr("No tag"), tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [=]() -> void {
                         tagSelectedItems(QString());
                     });
                 }
 
                 for (const QString& tagstr : currentProject->getTags()) {
                     auto *action = new QAction(tagstr, tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [=]() -> void {
                         tagSelectedItems(tagstr);
                     });
                 }
@@ -1293,7 +1293,7 @@ void ResultsTree::saveErrors(Report *report, const QStandardItem *fileItem) cons
 
 static int indexOf(const QList<ErrorItem> &list, const ErrorItem &item)
 {
-    auto it = std::find_if(list.cbegin(), list.cend(), [&](const ErrorItem& e) {
+    auto it = std::find_if(list.cbegin(), list.cend(), [&](const ErrorItem& e) -> bool {
         return ErrorItem::sameCID(item, e);
     });
     return it == list.cend() ? -1 : static_cast<int>(std::distance(list.cbegin(), it));

gui/threadresult.cpp

@@ -96,7 +96,7 @@ void ThreadResult::setFiles(std::list<FileWithDetails> files)
 
     // Determine the total size of all of the files to check, so that we can
     // show an accurate progress estimate
-    quint64 sizeOfFiles = std::accumulate(mFiles.cbegin(), mFiles.cend(), 0, [](quint64 total, const FileWithDetails& file) {
+    quint64 sizeOfFiles = std::accumulate(mFiles.cbegin(), mFiles.cend(), 0, [](quint64 total, const FileWithDetails& file) -> quint64 {
         return total + file.size();
     });
     mMaxProgress = sizeOfFiles;
@@ -115,7 +115,7 @@ void ThreadResult::setProject(const ImportProject &prj)
 
     // Determine the total size of all of the files to check, so that we can
     // show an accurate progress estimate
-    mMaxProgress = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
+    mMaxProgress = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) -> quint64 {
         return v + QFile(QString::fromStdString(fs.filename())).size();
     });
 }

lib/astutils.h

@@ -93,7 +93,7 @@ template<class TFunc>
 const Token* findAstNode(const Token* ast, const TFunc& pred)
 {
     const Token* result = nullptr;
-    visitAstNodes(ast, [&](const Token* tok) {
+    visitAstNodes(ast, [&](const Token* tok) -> ChildrenToVisit { // no suggestion
         if (pred(tok)) {
             result = tok;
             return ChildrenToVisit::done;