moved FileSettings::fsFileId to FileWithDetails

Author: firewave

gui/checkthread.cpp

@@ -238,7 +238,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
 
             const std::string &buildDir = settings.buildDir;
             if (!buildDir.empty()) {
-                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename(), fileSettings->cfg, fileSettings->fsFileId));
+                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename(), fileSettings->cfg, fileSettings->file.fsFileId()));
 
                 QStringList args2(args);
                 args2.insert(0,"-E");

lib/analyzerinfo.cpp

@@ -69,7 +69,7 @@ std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourc
 
     for (const FileSettings &fs : fileSettings) {
         const std::string afile = getFilename(fs.filename());
-        const std::string id = fs.fsFileId > 0 ? std::to_string(fs.fsFileId) : "";
+        const std::string id = fs.file.fsFileId() > 0 ? std::to_string(fs.file.fsFileId()) : "";
         ret << afile << ".a" << (++fileCount[afile]) << sep << fs.cfg << sep << id << sep << Path::simplifyPath(fs.filename()) << std::endl;
     }
 

lib/cppcheck.cpp

@@ -838,7 +838,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     }
     // need to pass the externally provided ErrorLogger instead of our internal wrapper
     CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
-    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg, fs.fsFileId);
+    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg, fs.file.fsFileId());
     if (mUnusedFunctionsCheck)
         mUnusedFunctionsCheck->updateFunctionData(*temp.mUnusedFunctionsCheck);
     while (!temp.mFileInfo.empty()) {
@@ -1635,8 +1635,8 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
-    for (const auto &f: fileSettings) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.filename(), f.fsFileId);
+    for (const auto &fs: fileSettings) {
+        const std::string &dumpFileName = getDumpFileName(mSettings, fs.filename(), fs.file.fsFileId());
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
@@ -1748,7 +1748,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     std::string line;
 
     if (!mSettings.buildDir.empty()) {
-        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "", fileSettings.fsFileId);
+        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "", fileSettings.file.fsFileId());
         std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
         fcmd << istr.str();
     }

lib/filesettings.h

@@ -35,15 +35,20 @@ class FileWithDetails
 {
 public:
     FileWithDetails(std::string path, Standards::Language lang, std::size_t size)
-        : mPath(std::move(path))
-        , mPathSimplified(Path::simplifyPath(mPath))
-        , mLang(lang)
+        : mLang(lang)
         , mSize(size)
     {
+        setPath(std::move(path));
         if (mPath.empty())
             throw std::runtime_error("empty path specified");
     }
 
+    void setPath(std::string path)
+    {
+        mPath = std::move(path);
+        mPathSimplified = Path::simplifyPath(mPath);
+    }
+
     const std::string& path() const
     {
         return mPath;
@@ -68,11 +73,22 @@ class FileWithDetails
     {
         return mLang;
     }
+
+    int fsFileId() const
+    {
+        return mFsFileId;
+    }
+
+    void setFsFileId(int fsFileId)
+    {
+        mFsFileId = fsFileId;
+    }
 private:
     std::string mPath;
     std::string mPathSimplified;
     Standards::Language mLang = Standards::Language::None;
     std::size_t mSize;
+    int mFsFileId{0};
 };
 
 /** File settings. Multiple configurations for a file is allowed. */
@@ -81,7 +97,6 @@ struct CPPCHECKLIB FileSettings {
         : file(std::move(path), lang, size)
     {}
 
-    int fsFileId = 0;
     std::string cfg;
     FileWithDetails file;
     const std::string& filename() const

lib/importproject.cpp

@@ -444,7 +444,7 @@ bool ImportProject::importCompileCommands(std::istream &istr)
         fsSetIncludePaths(fs, directory, fs.includePaths, variables);
         // Assign a unique index to each file path. If the file path already exists in the map,
         // increment the index to handle duplicate file entries.
-        fs.fsFileId = fsFileIds[path]++;
+        fs.file.setFsFileId(fsFileIds[path]++);
         fileSettings.push_back(std::move(fs));
     }
 
@@ -1562,7 +1562,7 @@ void ImportProject::setRelativePaths(const std::string &filename)
         return;
     const std::vector<std::string> basePaths{Path::fromNativeSeparators(Path::getCurrentPath())};
     for (auto &fs: fileSettings) {
-        fs.file = FileWithDetails{Path::getRelativePath(fs.filename(), basePaths), Standards::Language::None, 0}; // file will be identified later on
+        fs.file.setPath(Path::getRelativePath(fs.filename(), basePaths));
         for (auto &includePath: fs.includePaths)
             includePath = Path::getRelativePath(includePath, basePaths);
     }

test/testanalyzerinformation.cpp

@@ -59,9 +59,9 @@ class TestAnalyzerInformation : public TestFixture {
     void filesTextDuplicateFile() const {
         std::list<FileSettings> fileSettings;
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fsFileId = 0;
+        fileSettings.back().file.setFsFileId(0);
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fsFileId = 1;
+        fileSettings.back().file.setFsFileId(1);
 
         const char expected[] = "a.a1:::a.c\n"
                                 "a.a2::1:a.c\n";

test/testimportproject.cpp

@@ -371,8 +371,8 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS(2, importer.fileSettings.size());
         const FileSettings &fs1 = importer.fileSettings.front();
         const FileSettings &fs2 = importer.fileSettings.back();
-        ASSERT_EQUALS(0, fs1.fsFileId);
-        ASSERT_EQUALS(1, fs2.fsFileId);
+        ASSERT_EQUALS(0, fs1.file.fsFileId());
+        ASSERT_EQUALS(1, fs2.file.fsFileId());
     }
 
     void importCompileCommands14() const { // #14156