TextEditor: Merge some "assist" related classes

Simplifies the code base by removing one level of unused
and unneeded abstraction.

- Merge {I,Default}AssistInterface to AssistInterface
- Merge {IAssist,Basic}ProposalItem to AssistProposalItem
- Merge {IGenericProposal,BasicProposalItemList}Model to GenericProposalModel

Change-Id: I54ee7b095427383d67a00fc1d87c3808c21d812d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index b3191ba031..5da21718a1 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -34,7 +34,7 @@
 #include "cppvirtualfunctionassistprovider.h"
 #include "cppvirtualfunctionproposalitem.h"
 
-#include <texteditor/codeassist/basicproposalitemlistmodel.h>
+#include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/codeassist/iassistproposal.h>
 
@@ -124,7 +124,7 @@ public:
         VirtualFunctionAssistProvider::configure(params);
 
         IAssistProcessor *processor = createProcessor();
-        IAssistInterface *assistInterface
+        AssistInterface *assistInterface
                 = m_editorWidget->createAssistInterface(FollowSymbol, ExplicitlyInvoked);
         IAssistProposal *immediateProposal = processor->immediateProposal(assistInterface);
         IAssistProposal *finalProposal = processor->perform(assistInterface);
@@ -140,7 +140,7 @@ public:
     static OverrideItemList itemList(IAssistProposalModel *imodel)
     {
         OverrideItemList result;
-        BasicProposalItemListModel *model = dynamic_cast<BasicProposalItemListModel *>(imodel);
+        GenericProposalModel *model = dynamic_cast<GenericProposalModel *>(imodel);
         if (!model)
             return result;