nits

Author: wjakobsson

gui/mainwindow.cpp

@@ -619,7 +619,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bo
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
         std::list<std::string> sourcefiles;
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings, !recheckFiles.isEmpty());
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings);
     }
 
     //mThread->SetanalyzeProject(true);
@@ -700,7 +700,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, c
         std::transform(fileNames.cbegin(), fileNames.cend(), std::back_inserter(sourcefiles), [](const QString& s) {
             return s.toStdString();
         });
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {}, partialRecheck);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {});
     }
 
     mThread->setCheckFiles(true);
@@ -1448,7 +1448,7 @@ void MainWindow::clearResults(const QStringList& selectedFiles)
 {
     if (!selectedFiles.isEmpty()) {
         mUI->mResults->clear(false);
-        for (QString f : selectedFiles)
+        for (const QString& f : selectedFiles)
             mUI->mResults->clearRecheckFile(f);
         return;
     }

gui/mainwindow.h

@@ -322,7 +322,7 @@ private slots:
      * @param checkConfig Flag to indicate if the configuration should be checked.
      * @param partialRecheck Flag to indicate a partial recheck.
      */
-    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false, const bool partialRecheck = false);
+    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false, bool partialRecheck = false);
 
     /**
      * @brief Get our default cppcheck settings and read project file.

lib/analyzerinfo.cpp

@@ -24,12 +24,10 @@
 #include "utils.h"
 
 #include <array>
-#include <cstdlib>
 #include <cstring>
 #include <exception>
 #include <iostream>
 #include <map>
-#include <set>
 #include <sstream>
 #include <stdexcept>
 #include <utility>
@@ -53,48 +51,18 @@ static std::string getFilename(const std::string &fullpath)
     return fullpath.substr(pos1,pos2);
 }
 
-void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, bool merge)
+void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings)
 {
     const std::string filesTxt(buildDir + "/files.txt");
-
-    std::string keptLines;
-    std::map<std::string, unsigned int> fileCount;
-
-    if (merge) {
-        std::set<std::string> current;
-        for (const std::string &f : sourcefiles)
-            current.insert(Path::simplifyPath(f));
-        for (const FileSettings &fs : fileSettings)
-            current.insert(Path::simplifyPath(fs.filename()));
-
-        std::ifstream fin(filesTxt);
-        std::string line;
-        while (std::getline(fin, line)) {
-            Info info;
-            if (!info.parse(line))
-                continue;
-            if (current.count(info.sourceFile))
-                continue;
-            keptLines += line + '\n';
-
-            const std::string::size_type dotA = info.afile.rfind(".a");
-            if (dotA != std::string::npos) {
-                const std::string base = info.afile.substr(0, dotA);
-                const unsigned int n = std::strtoul(info.afile.c_str() + dotA + 2, nullptr, 10);
-                unsigned int &count = fileCount[base];
-                count = std::max(count, n);
-            }
-        }
-    }
-
     std::ofstream fout(filesTxt);
-    fout << keptLines;
-    fout << getFilesTxt(sourcefiles, fileSettings, fileCount);
+    fout << getFilesTxt(sourcefiles, fileSettings);
 }
 
-std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, std::map<std::string, unsigned int> fileCount) {
+std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings) {
     std::ostringstream ret;
 
+    std::map<std::string, unsigned int> fileCount;
+
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
         ret << afile << ".a" << (++fileCount[afile]) << sep << sep << sep << Path::simplifyPath(f) << '\n';

lib/analyzerinfo.h

@@ -27,7 +27,6 @@
 #include <fstream>
 #include <functional>
 #include <list>
-#include <map>
 #include <string>
 
 class ErrorMessage;
@@ -58,7 +57,7 @@ class CPPCHECKLIB AnalyzerInformation {
 public:
     ~AnalyzerInformation();
 
-    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, bool merge = false);
+    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
 
     /** Close current TU.analyzerinfo file */
     void close();
@@ -86,7 +85,7 @@ class CPPCHECKLIB AnalyzerInformation {
     static std::string processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug = false);
 
 protected:
-    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, std::map<std::string, unsigned int> fileCount = {});
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
 
     static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId);