diff options
| author | hjk <hjk121@nokiamail.com> | 2014-09-04 00:04:18 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-09-09 21:01:22 +0200 |
| commit | 0edefc4c2bb2e8b88d6e86c2fe768b597e16ede1 (patch) | |
| tree | 76f4c36eed6389537c49e549dfe9567e2e7737e8 /src/plugins/texteditor/basetexteditor.cpp | |
| parent | 0c3eeab464a488edfedb1e98b433102f2293669a (diff) | |
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>
Diffstat (limited to 'src/plugins/texteditor/basetexteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index c79c9f8f51..621cd81876 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -51,7 +51,7 @@ #include "basetexteditor.h" #include <texteditor/codeassist/codeassistant.h> -#include <texteditor/codeassist/defaultassistinterface.h> +#include <texteditor/codeassist/assistinterface.h> #include <texteditor/generichighlighter/context.h> #include <texteditor/generichighlighter/highlightdefinition.h> #include <texteditor/generichighlighter/highlighter.h> @@ -7014,11 +7014,11 @@ void BaseTextEditorWidget::invokeAssist(AssistKind kind, IAssistProvider *provid setOverwriteMode(previousMode); } -IAssistInterface *BaseTextEditorWidget::createAssistInterface(AssistKind kind, - AssistReason reason) const +AssistInterface *BaseTextEditorWidget::createAssistInterface(AssistKind kind, + AssistReason reason) const { Q_UNUSED(kind); - return new DefaultAssistInterface(document(), position(), d->m_document->filePath(), reason); + return new AssistInterface(document(), position(), d->m_document->filePath(), reason); } QString BaseTextEditorWidget::foldReplacementText(const QTextBlock &) const |