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>

3 files changed, 16 insertions, 17 deletions

diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 1d55acc3b9..a0a2ba528c 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -48,8 +48,8 @@
 
 #include <texteditor/basetexteditor.h>
 #include <texteditor/convenience.h>
-#include <texteditor/codeassist/basicproposalitemlistmodel.h>
-#include <texteditor/codeassist/basicproposalitem.h>
+#include <texteditor/codeassist/genericproposalmodel.h>
+#include <texteditor/codeassist/assistproposalitem.h>
 #include <texteditor/codeassist/functionhintproposal.h>
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/codeassist/ifunctionhintproposalmodel.h>
@@ -202,7 +202,7 @@ IAssistProcessor *ClangCompletionAssistProvider::createProcessor() const
     return new ClangCompletionAssistProcessor;
 }
 
-IAssistInterface *ClangCompletionAssistProvider::createAssistInterface(
+AssistInterface *ClangCompletionAssistProvider::createAssistInterface(
         const QString &filePath,
         QTextDocument *document, bool isObjCEnabled, int position, AssistReason reason) const
 {
@@ -235,11 +235,11 @@ IAssistInterface *ClangCompletionAssistProvider::createAssistInterface(
 // ------------------------
 // ClangAssistProposalModel
 // ------------------------
-class ClangAssistProposalModel : public TextEditor::BasicProposalItemListModel
+class ClangAssistProposalModel : public TextEditor::GenericProposalModel
 {
 public:
     ClangAssistProposalModel()
-        : TextEditor::BasicProposalItemListModel()
+        : TextEditor::GenericProposalModel()
         , m_sortable(false)
         , m_completionOperator(T_EOF_SYMBOL)
         , m_replaceDotForArrow(false)
@@ -257,7 +257,7 @@ public:
 class ClangAssistProposal : public TextEditor::GenericProposal
 {
 public:
-    ClangAssistProposal(int cursorPos, TextEditor::IGenericProposalModel *model)
+    ClangAssistProposal(int cursorPos, TextEditor::GenericProposalModel *model)
         : TextEditor::GenericProposal(cursorPos, model)
         , m_replaceDotForArrow(static_cast<ClangAssistProposalModel *>(model)->m_replaceDotForArrow)
     {}
@@ -345,7 +345,7 @@ int ClangFunctionHintModel::activeArgument(const QString &prefix) const
     return argnr;
 }
 
-class ClangAssistProposalItem : public TextEditor::BasicProposalItem
+class ClangAssistProposalItem : public TextEditor::AssistProposalItem
 {
 public:
     ClangAssistProposalItem() {}
@@ -550,7 +550,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P
         const QStringList &options,
         const QList<CppTools::ProjectPart::HeaderPath> &headerPaths,
         const PchInfo::Ptr &pchInfo)
-    : DefaultAssistInterface(document, position, fileName, reason)
+    : AssistInterface(document, position, fileName, reason)
     , m_clangWrapper(clangWrapper)
     , m_options(options)
     , m_headerPaths(headerPaths)
@@ -602,7 +602,7 @@ ClangCompletionAssistProcessor::~ClangCompletionAssistProcessor()
 {
 }
 
-IAssistProposal *ClangCompletionAssistProcessor::perform(const IAssistInterface *interface)
+IAssistProposal *ClangCompletionAssistProcessor::perform(const AssistInterface *interface)
 {
     m_interface.reset(static_cast<const ClangCompletionAssistInterface *>(interface));
 
diff --git a/src/plugins/clangcodemodel/clangcompletion.h b/src/plugins/clangcodemodel/clangcompletion.h
index 7a6946bd57..0f9ada9efd 100644
--- a/src/plugins/clangcodemodel/clangcompletion.h
+++ b/src/plugins/clangcodemodel/clangcompletion.h
@@ -37,9 +37,9 @@
 #include <cpptools/cppcompletionassistprovider.h>
 #include <cpptools/cppmodelmanagerinterface.h>
 
-#include <texteditor/codeassist/basicproposalitem.h>
+#include <texteditor/codeassist/assistproposalitem.h>
 #include <texteditor/codeassist/completionassistprovider.h>
-#include <texteditor/codeassist/defaultassistinterface.h>
+#include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/iassistprocessor.h>
 
 #include <QStringList>
@@ -56,7 +56,7 @@ public:
     ClangCompletionAssistProvider();
 
     virtual TextEditor::IAssistProcessor *createProcessor() const;
-    virtual TextEditor::IAssistInterface *createAssistInterface(
+    virtual TextEditor::AssistInterface *createAssistInterface(
             const QString &filePath,
             QTextDocument *document, bool isObjCEnabled, int position,
             TextEditor::AssistReason reason) const;
@@ -67,7 +67,7 @@ private:
 
 } // namespace Internal
 
-class CLANG_EXPORT ClangCompletionAssistInterface: public TextEditor::DefaultAssistInterface
+class CLANG_EXPORT ClangCompletionAssistInterface: public TextEditor::AssistInterface
 {
 public:
     ClangCompletionAssistInterface(ClangCodeModel::ClangCompleter::Ptr clangWrapper,
@@ -109,7 +109,7 @@ public:
     ClangCompletionAssistProcessor();
     virtual ~ClangCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface);
+    virtual TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface);
 
 private:
     int startCompletionHelper();
@@ -133,7 +133,7 @@ private:
 private:
     int m_startPosition;
     QScopedPointer<const ClangCompletionAssistInterface> m_interface;
-    QList<TextEditor::BasicProposalItem *> m_completions;
+    QList<TextEditor::AssistProposalItem *> m_completions;
     CPlusPlus::Icons m_icons;
     QStringList m_preprocessorCompletions;
     QScopedPointer<Internal::ClangAssistProposalModel> m_model;
diff --git a/src/plugins/clangcodemodel/test/completiontesthelper.cpp b/src/plugins/clangcodemodel/test/completiontesthelper.cpp
index e11bbb1222..9f087b75d6 100644
--- a/src/plugins/clangcodemodel/test/completiontesthelper.cpp
+++ b/src/plugins/clangcodemodel/test/completiontesthelper.cpp
@@ -39,8 +39,7 @@
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/codeassist/iassistproposal.h>
-#include <texteditor/codeassist/iassistproposalmodel.h>
-#include <texteditor/codeassist/basicproposalitemlistmodel.h>
+#include <texteditor/codeassist/genericproposalmodel.h>
 
 #include <utils/fileutils.h>
 #include <utils/changeset.h>