feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Move CompletionAssistProvider construction

Browse Source 
... to the editor factories and pass it to the document, not the widget.
Saves some code, puts fewer objects into the object pool.

Change-Id: Iaaf250af74dc4e0c62700873accbb40ba88b7d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2014-10-01 22:39:47 +02:00
parent 5bb8134ec1
commit 1f65111e55
25 changed files with 78 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/textdocument.cpp
View File

@@ -76,6 +76,7 @@ public:
TextDocumentPrivate() :
m_fontSettingsNeedsApply(false),
m_highlighter(0),
m_completionAssistProvider(0),
m_indenter(new Indenter),
m_fileIsReadOnly(false),
m_autoSaveRevision(-1)
@@ -97,6 +98,7 @@ public:
bool m_fontSettingsNeedsApply; // for applying font settings delayed till an editor becomes visible
QTextDocument m_document;
SyntaxHighlighter *m_highlighter;
CompletionAssistProvider *m_completionAssistProvider;
QScopedPointer<Indenter> m_indenter;
bool m_fileIsReadOnly;
@@ -314,6 +316,16 @@ void TextDocument::triggerPendingUpdates()
applyFontSettings();
}
void TextDocument::setCompletionAssistProvider(CompletionAssistProvider *provider)
{
d->m_completionAssistProvider = provider;
}
CompletionAssistProvider *TextDocument::completionAssistProvider() const
{
return d->m_completionAssistProvider;
}
void TextDocument::applyFontSettings()
{
d->m_fontSettingsNeedsApply = false;