Clang: Rename FileInformation in FileStatus

It's more near to the Unix convention and it has a plural too.

Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri

@@ -16,8 +16,8 @@ HEADERS += \
     $$PWD/projectpartentry.h \
     $$PWD/symbolsvisitorbase.h \
     $$PWD/usedmacro.h \
-    $$PWD/fileinformation.h \
-    $$PWD/sourcedependency.h
+    $$PWD/sourcedependency.h \
+    $$PWD/filestatus.h
 
 !isEmpty(LIBTOOLING_LIBS) {
 SOURCES += \

src/tools/clangrefactoringbackend/source/collectmacrospreprocessorcallbacks.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileinformation.h"
+#include "filestatus.h"
 #include "symbolsvisitorbase.h"
 #include "sourcedependency.h"
 #include "sourcelocationsutils.h"
@@ -50,7 +50,7 @@ public:
                                        SourceLocationEntries &sourceLocationEntries,
                                        FilePathIds &sourceFiles,
                                        UsedMacros &usedMacros,
-                                       FileInformations &fileInformations,
+                                       FileStatuses &fileStatuses,
                                        SourceDependencies &sourceDependencies,
                                        FilePathCachingInterface &filePathCache,
                                        const clang::SourceManager &sourceManager,
@@ -62,7 +62,7 @@ public:
           m_sourceLocationEntries(sourceLocationEntries),
           m_sourceFiles(sourceFiles),
           m_usedMacros(usedMacros),
-          m_fileInformations(fileInformations)
+          m_fileStatuses(fileStatuses)
     {
     }
 
@@ -76,7 +76,7 @@ public:
             const clang::FileEntry *fileEntry = m_sourceManager.getFileEntryForID(
                         m_sourceManager.getFileID(sourceLocation));
             if (fileEntry) {
-                m_fileInformations.emplace_back(filePathId(fileEntry),
+                m_fileStatuses.emplace_back(filePathId(fileEntry),
                                                 fileEntry->getSize(),
                                                 fileEntry->getModificationTime());
                 addSourceFile(fileEntry);
@@ -284,7 +284,7 @@ private:
     SourceLocationEntries &m_sourceLocationEntries;
     FilePathIds &m_sourceFiles;
     UsedMacros &m_usedMacros;
-    FileInformations &m_fileInformations;
+    FileStatuses &m_fileStatuses;
     bool m_skipInclude = false;
 };
 

src/tools/clangrefactoringbackend/source/collectmacrossourcefilecallbacks.cpp

@@ -38,7 +38,7 @@ bool CollectMacrosSourceFileCallbacks::handleBeginSource(clang::CompilerInstance
                 m_sourceLocationEntries,
                 m_sourceFiles,
                 m_usedMacros,
-                m_fileInformations,
+                m_fileStatuses,
                 m_sourceDependencies,
                 m_filePathCache,
                 compilerInstance.getSourceManager(),

src/tools/clangrefactoringbackend/source/collectmacrossourcefilecallbacks.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileinformation.h"
+#include "filestatus.h"
 #include "sourcedependency.h"
 #include "sourcelocationentry.h"
 #include "symbolentry.h"
@@ -65,7 +65,7 @@ public:
     {
         m_sourceFiles.clear();
         m_usedMacros.clear();
-        m_fileInformations.clear();
+        m_fileStatuses.clear();
     }
 
     const UsedMacros &usedMacros() const
@@ -73,9 +73,9 @@ public:
         return m_usedMacros;
     }
 
-    const FileInformations &fileInformations() const
+    const FileStatuses &fileStatuses() const
     {
-        return m_fileInformations;
+        return m_fileStatuses;
     }
 
     const SourceDependencies &sourceDependencies() const
@@ -86,7 +86,7 @@ public:
 private:
     FilePathIds m_sourceFiles;
     UsedMacros m_usedMacros;
-    FileInformations m_fileInformations;
+    FileStatuses m_fileStatuses;
     SourceDependencies m_sourceDependencies;
     SymbolEntries &m_symbolEntries;
     SourceLocationEntries &m_sourceLocationEntries;

src/tools/clangrefactoringbackend/source/filestatus.h

@@ -33,10 +33,10 @@
 
 namespace ClangBackEnd {
 
-class FileInformation
+class FileStatus
 {
 public:
-    FileInformation(FilePathId filePathId,
+    FileStatus(FilePathId filePathId,
                     off_t size,
                     std::time_t lastModified)
         : filePathId(filePathId),
@@ -45,7 +45,7 @@ public:
     {}
 
     friend
-    bool operator==(const FileInformation &first, const FileInformation &second)
+    bool operator==(const FileStatus &first, const FileStatus &second)
     {
         return first.filePathId == second.filePathId
             && first.size == second.size
@@ -58,5 +58,5 @@ public:
     std::time_t lastModified;
 };
 
-using FileInformations = std::vector<FileInformation>;
+using FileStatuses = std::vector<FileStatus>;
 }

src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h

@@ -197,8 +197,8 @@ public:
         "DELETE FROM newUsedMacros",
         database
     };
-   WriteStatement insertFileInformations{
-        "INSERT OR REPLACE INTO fileInformations(sourceId, size, lastModified) VALUES (?,?,?)",
+   WriteStatement insertFileStatuses{
+        "INSERT OR REPLACE INTO fileStatuses(sourceId, size, lastModified) VALUES (?,?,?)",
         database
     };
    WriteStatement insertIntoNewSourceDependenciesStatement{

src/tools/clangrefactoringbackend/source/symbolindexer.cpp

@@ -71,7 +71,7 @@ void SymbolIndexer::updateProjectPart(V2::ProjectPartContainer &&projectPart,
 
     m_symbolStorage.insertOrUpdateUsedMacros(m_symbolsCollector.usedMacros());
 
-    m_symbolStorage.insertFileInformations(m_symbolsCollector.fileInformations());
+    m_symbolStorage.insertFileStatuses(m_symbolsCollector.fileStatuses());
 
     m_symbolStorage.insertOrUpdateSourceDependencies(m_symbolsCollector.sourceDependencies());
 

src/tools/clangrefactoringbackend/source/symbolscollector.cpp

@@ -82,9 +82,9 @@ const UsedMacros &SymbolsCollector::usedMacros() const
     return m_collectMacrosSourceFileCallbacks.usedMacros();
 }
 
-const FileInformations &SymbolsCollector::fileInformations() const
+const FileStatuses &SymbolsCollector::fileStatuses() const
 {
-    return m_collectMacrosSourceFileCallbacks.fileInformations();
+    return m_collectMacrosSourceFileCallbacks.fileStatuses();
 }
 
 const SourceDependencies &SymbolsCollector::sourceDependencies() const

src/tools/clangrefactoringbackend/source/symbolscollector.h

@@ -52,7 +52,7 @@ public:
     const SourceLocationEntries &sourceLocations() const override;
     const FilePathIds &sourceFiles() const override;
     const UsedMacros &usedMacros() const override;
-    const FileInformations &fileInformations() const override;
+    const FileStatuses &fileStatuses() const override;
     const SourceDependencies &sourceDependencies() const override;
 
 private:

src/tools/clangrefactoringbackend/source/symbolscollectorinterface.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileinformation.h"
+#include "filestatus.h"
 #include "symbolentry.h"
 #include "sourcedependency.h"
 #include "sourcelocationentry.h"
@@ -56,7 +56,7 @@ public:
     virtual const SourceLocationEntries &sourceLocations() const = 0;
     virtual const FilePathIds &sourceFiles() const = 0;
     virtual const UsedMacros &usedMacros() const = 0;
-    virtual const FileInformations &fileInformations() const = 0;
+    virtual const FileStatuses &fileStatuses() const = 0;
     virtual const SourceDependencies &sourceDependencies() const = 0;
 };
 

src/tools/clangrefactoringbackend/source/symbolstorage.h

@@ -120,14 +120,14 @@ public:
             insertStatement.write(projectPartId, sourceFilePathId.filePathId);
     }
 
-    void insertFileInformations(const FileInformations &fileInformations)
+    void insertFileStatuses(const FileStatuses &fileStatuses)
     {
-        WriteStatement &statement = m_statementFactory.insertFileInformations;
+        WriteStatement &statement = m_statementFactory.insertFileStatuses;
 
-        for (const FileInformation &fileInformation : fileInformations)
-            statement.write(fileInformation.filePathId.filePathId,
-                            fileInformation.size,
-                            fileInformation.lastModified);
+        for (const FileStatus &fileStatus : fileStatuses)
+            statement.write(fileStatus.filePathId.filePathId,
+                            fileStatus.size,
+                            fileStatus.lastModified);
     }
 
     static Utils::SmallString toJson(const Utils::SmallStringVector &strings)

src/tools/clangrefactoringbackend/source/symbolstorageinterface.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileinformation.h"
+#include "filestatus.h"
 #include "projectpartentry.h"
 #include "sourcelocationentry.h"
 #include "sourcedependency.h"
@@ -52,7 +52,7 @@ public:
     virtual void updateProjectPartSources(Utils::SmallStringView projectPartName,
                                           const FilePathIds &sourceFilePathIds) = 0;
     virtual void insertOrUpdateUsedMacros(const UsedMacros &usedMacros) = 0;
-    virtual void insertFileInformations(const FileInformations &fileInformations) = 0;
+    virtual void insertFileStatuses(const FileStatuses &fileStatuses) = 0;
     virtual void insertOrUpdateSourceDependencies(const SourceDependencies &sourceDependencies) = 0;
 };