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

5
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -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);