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

TextEditor: Move BookmarkManager instance closer to its code

Browse Source 
This is similar to the recently promoted setupXXX() pattern, not
100% there, though.

Change-Id: Ia6b302af5c8b647ed073ec45179eb2413e988885
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2024-01-17 15:14:37 +01:00
parent ef8323ee96
commit b7d646644d
5 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -82,9 +82,8 @@ public:
void createStandardContextMenu();
BookmarkManager m_bookmarkManager;
BookmarkFilter m_bookmarkFilter{&m_bookmarkManager};
BookmarkViewFactory m_bookmarkViewFactory{&m_bookmarkManager};
BookmarkFilter m_bookmarkFilter;
BookmarkViewFactory m_bookmarkViewFactory;
TextEditorSettings settings;
@@ -110,9 +109,9 @@ void TextEditorPluginPrivate::editorOpened(IEditor *editor)
{
if (auto widget = TextEditorWidget::fromEditor(editor)) {
connect(widget, &TextEditorWidget::markRequested,
this, [this, editor](TextEditorWidget *, int line, TextMarkRequestKind kind) {
this, [editor](TextEditorWidget *, int line, TextMarkRequestKind kind) {
if (kind == BookmarkRequest && !editor->document()->isTemporary())
m_bookmarkManager.toggleBookmark(editor->document()->filePath(), line);
bookmarkManager().toggleBookmark(editor->document()->filePath(), line);
});
connect(widget, &TextEditorWidget::markContextMenuRequested,
@@ -134,7 +133,7 @@ void TextEditorPluginPrivate::requestContextMenu(TextEditorWidget *widget,
if (widget->textDocument()->isTemporary())
return;
m_bookmarkManager.requestContextMenu(widget->textDocument()->filePath(), lineNumber, menu);
bookmarkManager().requestContextMenu(widget->textDocument()->filePath(), lineNumber, menu);
}
static class TextEditorPlugin *m_instance = nullptr;
@@ -178,6 +177,8 @@ void TextEditorPlugin::initialize()
setupOutlineFactory();
setupLineNumberFilter(); // Goto line functionality for quick open
setupBookmarkManager(this);
d = new TextEditorPluginPrivate;
Context context(TextEditor::Constants::C_TEXTEDITOR);