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>

src/plugins/texteditor/snippets/snippetassistcollector.cpp

@@ -31,14 +31,12 @@
 #include "snippetscollection.h"
 
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/codeassist/basicproposalitem.h>
+#include <texteditor/codeassist/assistproposalitem.h>
 
 using namespace TextEditor;
 using namespace Internal;
 
-namespace {
-
-void appendSnippets(QList<BasicProposalItem *> *items,
+static void appendSnippets(QList<AssistProposalItem *> *items,
                     const QString &groupId,
                     const QIcon &icon,
                     int order)
@@ -47,7 +45,7 @@ void appendSnippets(QList<BasicProposalItem *> *items,
     const int size = collection->totalActiveSnippets(groupId);
     for (int i = 0; i < size; ++i) {
         const Snippet &snippet = collection->snippet(i, groupId);
-        BasicProposalItem *item = new BasicProposalItem;
+        AssistProposalItem *item = new AssistProposalItem;
         item->setText(snippet.trigger() + QLatin1Char(' ') + snippet.complement());
         item->setData(snippet.content());
         item->setDetail(snippet.generateTip());
@@ -57,8 +55,6 @@ void appendSnippets(QList<BasicProposalItem *> *items,
     }
 }
 
-} // anonymous
-
 
 SnippetAssistCollector::SnippetAssistCollector(const QString &groupId, const QIcon &icon, int order)
     : m_groupId(groupId)
@@ -69,9 +65,9 @@ SnippetAssistCollector::SnippetAssistCollector(const QString &groupId, const QIc
 SnippetAssistCollector::~SnippetAssistCollector()
 {}
 
-QList<BasicProposalItem *> SnippetAssistCollector::collect() const
+QList<AssistProposalItem *> SnippetAssistCollector::collect() const
 {
-    QList<BasicProposalItem *> snippets;
+    QList<AssistProposalItem *> snippets;
     appendSnippets(&snippets, m_groupId, m_icon, m_order);
     appendSnippets(&snippets, QLatin1String(Constants::TEXT_SNIPPET_GROUP_ID), m_icon, m_order);
     return snippets;

src/plugins/texteditor/snippets/snippetassistcollector.h

@@ -38,7 +38,7 @@
 
 namespace TextEditor {
 
-class BasicProposalItem;
+class AssistProposalItem;
 
 class TEXTEDITOR_EXPORT SnippetAssistCollector
 {
@@ -46,7 +46,7 @@ public:
     SnippetAssistCollector(const QString &groupId, const QIcon &icon, int order = 0);
     ~SnippetAssistCollector();
 
-    QList<BasicProposalItem *> collect() const;
+    QList<AssistProposalItem *> collect() const;
 
 private:
     QString m_groupId;