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,

clang-tidy.md

@@ -129,7 +129,6 @@ Does not improve the readability.
 `readability-avoid-nested-conditional-operator`<br/>
 `modernize-use-designated-initializers`<br/>
 `readability-enum-initial-value`<br/>
-`modernize-use-trailing-return-type`<br/>
 
 To be evaluated (need to remove exclusion).
 

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();
     });
 

cli/threadexecutor.cpp

@@ -92,7 +92,7 @@ class ThreadData
         mItNextFileSettings = mFileSettings.begin();
 
         mTotalFiles = mFiles.size() + mFileSettings.size();
-        mTotalFileSize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& p) {
+        mTotalFileSize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& p) -> std::size_t {
             return v + p.size();
         });
     }
@@ -210,7 +210,7 @@ unsigned int ThreadExecutor::check()
         }
     }
 
-    unsigned int result = std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) {
+    unsigned int result = std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) -> unsigned int {
         return v + f.get();
     });
 

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/compliancereportdialog.cpp

@@ -80,7 +80,7 @@ static void addHeaders(const QString& file1, QSet<QString> &allFiles) {
 
 static std::vector<std::string> toStdStringList(const QStringList& from) {
     std::vector<std::string> ret;
-    std::transform(from.cbegin(), from.cend(), std::back_inserter(ret), [](const QString& e) {
+    std::transform(from.cbegin(), from.cend(), std::back_inserter(ret), [](const QString& e) -> std::string {
         return e.toStdString();
     });
     return ret;

gui/filelist.cpp

@@ -111,7 +111,7 @@ void FileList::addExcludeList(const QStringList &paths)
 static std::vector<std::string> toStdStringList(const QStringList &stringList)
 {
     std::vector<std::string> ret;
-    std::transform(stringList.cbegin(), stringList.cend(), std::back_inserter(ret), [](const QString& s) {
+    std::transform(stringList.cbegin(), stringList.cend(), std::back_inserter(ret), [](const QString& s) -> std::string {
         return s.toStdString();
     });
     return ret;