From 0fd238fea4cbd2016e8b73094a34ae90bf911dd6 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Wed, 4 Aug 2021 15:28:01 +0200 Subject: [PATCH] UI: Fix the getDocument in ScriptDocumentView and mark destructor "override" in VivyDocumentView as it overrides the previous one --- src/UI/ScriptDocumentView.cc | 6 ++++++ src/UI/ScriptDocumentView.hh | 6 +----- src/UI/VivyDocumentView.hh | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/UI/ScriptDocumentView.cc b/src/UI/ScriptDocumentView.cc index 35e340ea..786dd203 100644 --- a/src/UI/ScriptDocumentView.cc +++ b/src/UI/ScriptDocumentView.cc @@ -48,6 +48,12 @@ ScriptDocumentView::getDocumentTabIcon() const noexcept return QIcon(VIVY_ICON_SCRIPT); } +AbstractDocument * +ScriptDocumentView::getDocument() const noexcept +{ + return document.get(); +} + void ScriptDocumentView::openProperties() noexcept { diff --git a/src/UI/ScriptDocumentView.hh b/src/UI/ScriptDocumentView.hh index 7a3d0a03..c78c3483 100644 --- a/src/UI/ScriptDocumentView.hh +++ b/src/UI/ScriptDocumentView.hh @@ -30,11 +30,7 @@ public: QString getDocumentTabName() const noexcept override; QString getDocumentTabToolTip() const noexcept override; QIcon getDocumentTabIcon() const noexcept override; - - AbstractDocument *getDocument() const noexcept override - { - return nullptr; - } + AbstractDocument *getDocument() const noexcept override; private: ScriptEditor *editor{ nullptr }; diff --git a/src/UI/VivyDocumentView.hh b/src/UI/VivyDocumentView.hh index 96a59876..56c54a49 100644 --- a/src/UI/VivyDocumentView.hh +++ b/src/UI/VivyDocumentView.hh @@ -22,7 +22,7 @@ class VivyDocumentView final : public AbstractDocumentView { public: explicit VivyDocumentView(std::shared_ptr<VivyDocument>, QWidget *parent) noexcept; - ~VivyDocumentView() noexcept; + ~VivyDocumentView() noexcept override; void closeDocument() noexcept override; void openProperties() noexcept override; -- GitLab