CppTools: Remove some duplication

Change-Id: I8c84660b28c3e76b2cedd08ff3b44a38583f38a0
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/clangcodemodel/clangeditordocumentparser.cpp

@@ -36,11 +36,13 @@ ClangEditorDocumentParser::ClangEditorDocumentParser(const QString &filePath)
 }
 
 void ClangEditorDocumentParser::updateImpl(const QFutureInterface<void> &,
-                                           const CppTools::WorkingCopy &,
-                                           const ProjectExplorer::Project *activeProject)
+                                           const UpdateParams &updateParams)
 {
     State state_ = state();
-    state_.projectPart = determineProjectPart(filePath(), configuration(), state_, activeProject);
+    state_.projectPart = determineProjectPart(filePath(),
+                                              configuration(),
+                                              state_,
+                                              updateParams.activeProject);
     setState(state_);
 }
 

src/plugins/clangcodemodel/clangeditordocumentparser.h

@@ -38,8 +38,7 @@ public:
 
 private:
     void updateImpl(const QFutureInterface<void> &future,
-                    const CppTools::WorkingCopy &,
-                    const ProjectExplorer::Project *activeProject) override;
+                    const UpdateParams &updateParams) override;
 };
 
 } // namespace ClangCodeModel

src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

@@ -46,8 +46,6 @@
 #include <cpptools/cppworkingcopy.h>
 #include <cpptools/editordocumenthandle.h>
 
-#include <projectexplorer/session.h>
-
 #include <texteditor/convenience.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditor.h>
@@ -103,7 +101,8 @@ ClangEditorDocumentProcessor::~ClangEditorDocumentProcessor()
     }
 }
 
-void ClangEditorDocumentProcessor::run()
+void ClangEditorDocumentProcessor::runImpl(
+        const CppTools::BaseEditorDocumentParser::UpdateParams &updateParams)
 {
     m_updateTranslationUnitTimer.start();
 
@@ -116,13 +115,7 @@ void ClangEditorDocumentProcessor::run()
     m_parserRevision = revision();
     connect(&m_parserWatcher, &QFutureWatcher<void>::finished,
             this, &ClangEditorDocumentProcessor::onParserFinished);
-    const CppTools::WorkingCopy workingCopy = CppTools::CppModelManager::instance()->workingCopy();
-    const ProjectExplorer::Project *activeProject
-            = ProjectExplorer::SessionManager::startupProject();
-    const QFuture<void> future = ::Utils::runAsync(&runParser,
-                                                   parser(),
-                                                   workingCopy,
-                                                   activeProject);
+    const QFuture<void> future = ::Utils::runAsync(&runParser, parser(), updateParams);
     m_parserWatcher.setFuture(future);
 
     // Run builtin processor

src/plugins/clangcodemodel/clangeditordocumentprocessor.h

@@ -55,7 +55,7 @@ public:
     ~ClangEditorDocumentProcessor();
 
     // BaseEditorDocumentProcessor interface
-    void run() override;
+    void runImpl(const CppTools::BaseEditorDocumentParser::UpdateParams &updateParams) override;
     void semanticRehighlight() override;
     void recalculateSemanticInfoDetached(bool force) override;
     CppTools::SemanticInfo recalculateSemanticInfo() override;