C++: remove builtin FollowSymbol dependency from CppEditor

Move FollowSymbolUnderCursor to CppTools and
builtin member ownership to internal model manager.

Change-Id: I97a4f744ec1709ccc0b34fb67b58680973ef566f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 9c45cea055..1f7576c49b 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -28,10 +28,10 @@
 #include "cppeditorplugin.h"
 #include "cppeditortestcase.h"
 #include "cppelementevaluator.h"
-#include "cppfollowsymbolundercursor.h"
-#include "cppvirtualfunctionassistprovider.h"
-#include "cppvirtualfunctionproposalitem.h"
 
+#include <cpptools/cppfollowsymbolundercursor.h>
+#include <cpptools/cppvirtualfunctionassistprovider.h>
+#include <cpptools/cppvirtualfunctionproposalitem.h>
 #include <cpptools/cpptoolstestcase.h>
 #include <cpptools/cppmodelmanager.h>
 
@@ -327,10 +327,8 @@ F2TestCase::F2TestCase(CppEditorAction action,
     switch (action) {
     case FollowSymbolUnderCursorAction: {
         CppEditorWidget *widget = initialTestFile->m_editorWidget;
-        FollowSymbolInterface* delegate = widget->followSymbolInterface();
-        if (!delegate)
-            QFAIL("No follow symbol interface");
-        auto* builtinFollowSymbol = dynamic_cast<FollowSymbolUnderCursor *>(delegate);
+        FollowSymbolInterface &delegate = CppModelManager::instance()->followSymbolInterface();
+        auto* builtinFollowSymbol = dynamic_cast<FollowSymbolUnderCursor *>(&delegate);
         if (!builtinFollowSymbol) {
             if (filePaths.size() > 1)
                 QSKIP("Clang FollowSymbol does not currently support multiple files (except cpp+header)");