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>
This commit is contained in:
hjk
2014-09-04 00:04:18 +02:00
parent 0c3eeab464
commit 0edefc4c2b
60 changed files with 464 additions and 766 deletions

View File

@@ -38,7 +38,7 @@ namespace TextEditor {
class IAssistProcessor;
class IAssistProposal;
class IAssistInterface;
class AssistInterface;
namespace Internal {
@@ -51,7 +51,7 @@ public:
virtual ~ProcessorRunner();
void setProcessor(IAssistProcessor *processor); // Takes ownership of the processor.
void setAssistInterface(IAssistInterface *interface);
void setAssistInterface(AssistInterface *interface);
void setDiscardProposal(bool discard);
// @TODO: Not really necessary...
@@ -64,7 +64,7 @@ public:
private:
IAssistProcessor *m_processor;
IAssistInterface *m_interface;
AssistInterface *m_interface;
bool m_discardProposal;
IAssistProposal *m_proposal;
AssistReason m_reason;