diff options
| author | hjk <hjk121@nokiamail.com> | 2014-10-01 22:39:47 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-10-06 22:32:48 +0200 |
| commit | 1f65111e55b3e487289ff7a0dfbd4313c383d77f (patch) | |
| tree | c68d02e06a8c95ee85ec267b409eccc0d6797dbe /src/plugins/cmakeprojectmanager/cmakeeditor.cpp | |
| parent | 5bb8134ec135eae72d738220d2acd037d00cafbf (diff) | |
TextEditor: Move CompletionAssistProvider construction
... 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>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeeditor.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeeditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 9776cc59f6..83be6fad6e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -154,7 +154,6 @@ private: CMakeEditorWidget::CMakeEditorWidget() { setCodeFoldingSupported(true); - setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<CMakeFileCompletionAssistProvider>()); } void CMakeEditorWidget::contextMenuEvent(QContextMenuEvent *e) @@ -271,7 +270,7 @@ QString CMakeDocument::suggestedFileName() const // CMakeEditorFactory // -CMakeEditorFactory::CMakeEditorFactory() +CMakeEditorFactory::CMakeEditorFactory(CMakeSettingsPage *settingsPage) { setId(Constants::CMAKE_EDITOR_ID); setDisplayName(tr(Constants::CMAKE_EDITOR_DISPLAY_NAME)); @@ -284,6 +283,8 @@ CMakeEditorFactory::CMakeEditorFactory() setGenericSyntaxHighlighter(QLatin1String(Constants::CMAKEMIMETYPE)); setCommentStyle(Utils::CommentDefinition::HashStyle); + setCompletionAssistProvider(new CMakeFileCompletionAssistProvider(settingsPage)); + setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection | TextEditorActionHandler::JumpToFileUnderCursor); |