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

TextEditor: Return BaseTextEditor for duplicate

Browse Source 
Because the type is always a BaseTextEditor we can return a
BaseTextEditor type. C++ is allowing to change the overload return type
so long it is compatible.

Change-Id: Ib4c88faaa6fdfb97fd03c51a120de0fa0c2d00cd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marco Bubke
2023-04-18 15:59:19 +02:00
parent cf61025af6
commit 79b5a9f03e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
View File

@@ -80,8 +80,7 @@ void TextEditorView::modelAttached(Model *model)
AbstractView::modelAttached(model);
auto textEditor = Utils::UniqueObjectLatePtr<TextEditor::BaseTextEditor>(
static_cast<TextEditor::BaseTextEditor *>(
QmlDesignerPlugin::instance()->currentDesignDocument()->textEditor()->duplicate()));
QmlDesignerPlugin::instance()->currentDesignDocument()->textEditor()->duplicate());
// Set the context of the text editor, but we add another special context to override shortcuts.
Core::Context context = textEditor->context();

4
src/plugins/texteditor/texteditor.cpp
View File

@@ -8940,11 +8940,11 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
return editor;
}
IEditor *BaseTextEditor::duplicate()
BaseTextEditor *BaseTextEditor::duplicate()
{
// Use new standard setup if that's available.
if (d->m_origin) {
IEditor *dup = d->m_origin->duplicateTextEditor(this);
BaseTextEditor *dup = d->m_origin->duplicateTextEditor(this);
emit editorDuplicated(dup);
return dup;
}

2
src/plugins/texteditor/texteditor.h
View File

@@ -110,7 +110,7 @@ public:
// IEditor
Core::IDocument *document() const override;
IEditor *duplicate() override;
BaseTextEditor *duplicate() override;
QByteArray saveState() const override;
void restoreState(const QByteArray &state) override;