diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2023-04-18 15:59:19 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2023-04-19 10:17:56 +0000 |
| commit | 79b5a9f03e01712613581e630e51a5143fd9f647 (patch) | |
| tree | 9ab719d708ba491fb8cb85dbd5924bf824dedc2d | |
| parent | cf61025af64485b8ec1fdaa0405541810cc7e813 (diff) | |
| download | qt-creator-79b5a9f03e01712613581e630e51a5143fd9f647.tar.gz | |
TextEditor: Return BaseTextEditor for duplicate
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>
| -rw-r--r-- | src/plugins/qmldesigner/components/texteditor/texteditorview.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditor.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditor.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index fb33794ea8..1921487aa0 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -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(); diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 92c27723b9..f348aa7ce6 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -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; } diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index dc492eca21..98bddb84b9 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -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; |
