ClangRefactoring: Improve indexing

Fix some bugs in the indexing and use the new macro indexer from clang.

Change-Id: I2ba1b28097a8751aea942071851a60d164c6f371
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.h b/src/tools/clangrefactoringbackend/source/symbolscollector.h
index b37647e969..cc7ca4396c 100644
--- a/src/tools/clangrefactoringbackend/source/symbolscollector.h
+++ b/src/tools/clangrefactoringbackend/source/symbolscollector.h
@@ -58,10 +58,7 @@ public:
 
     const SymbolEntries &symbols() const override;
     const SourceLocationEntries &sourceLocations() const override;
-    const FilePathIds &sourceFiles() const override;
-    const UsedMacros &usedMacros() const override;
     const FileStatuses &fileStatuses() const override;
-    const SourceDependencies &sourceDependencies() const override;
 
     bool isUsed() const override;
     void setIsUsed(bool isUsed) override;
@@ -71,10 +68,11 @@ private:
     ClangTool m_clangTool;
     SymbolEntries m_symbolEntries;
     SourceLocationEntries m_sourceLocationEntries;
+    FileStatuses m_fileStatuses;
     std::shared_ptr<IndexDataConsumer> m_indexDataConsumer;
     CollectSymbolsAction m_collectSymbolsAction;
-    CollectMacrosSourceFileCallbacks m_collectMacrosSourceFileCallbacks;
-    SourcesManager m_sourcesManager;
+    SourcesManager m_symbolSourcesManager;
+    SourcesManager m_macroSourcesManager;
     bool m_isUsed = false;
 };