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, 7 insertions, 11 deletions

diff --git a/src/tools/clangpchmanagerbackend/source/collectbuilddependencyaction.h b/src/tools/clangpchmanagerbackend/source/collectbuilddependencyaction.h
index fa1a10e79c..3e98dc2483 100644
--- a/src/tools/clangpchmanagerbackend/source/collectbuilddependencyaction.h
+++ b/src/tools/clangpchmanagerbackend/source/collectbuilddependencyaction.h
@@ -40,15 +40,13 @@ class CollectBuildDependencyAction final : public clang::PreprocessOnlyAction
 {
 public:
     CollectBuildDependencyAction(BuildDependency &buildDependency,
-                          const FilePathCachingInterface &filePathCache,
-                          std::vector<uint> &excludedIncludeUID,
-                          std::vector<uint> &alreadyIncludedFileUIDs,
-                          SourcesManager &sourcesManager)
-        : m_buildDependency(buildDependency),
-          m_filePathCache(filePathCache),
-          m_excludedIncludeUID(excludedIncludeUID),
-          m_alreadyIncludedFileUIDs(alreadyIncludedFileUIDs),
-          m_sourcesManager(sourcesManager)
+                                 const FilePathCachingInterface &filePathCache,
+                                 std::vector<uint> &excludedIncludeUID,
+                                 std::vector<uint> &alreadyIncludedFileUIDs)
+        : m_buildDependency(buildDependency)
+        , m_filePathCache(filePathCache)
+        , m_excludedIncludeUID(excludedIncludeUID)
+        , m_alreadyIncludedFileUIDs(alreadyIncludedFileUIDs)
     {
     }
 
@@ -66,7 +64,6 @@ public:
                 m_excludedIncludeUID,
                 m_alreadyIncludedFileUIDs,
                 compilerInstance.getSourceManager(),
-                m_sourcesManager,
                 compilerInstance.getPreprocessorPtr());
 
             preprocessor.addPPCallbacks(
@@ -88,7 +85,6 @@ private:
     const FilePathCachingInterface &m_filePathCache;
     std::vector<uint> &m_excludedIncludeUID;
     std::vector<uint> &m_alreadyIncludedFileUIDs;
-    SourcesManager &m_sourcesManager;
 };
 
 } // namespace ClangBackEnd