From 8e7e1dd5f2e3d0179b9b49c2914a87b09006a12c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 7 Dec 2022 18:35:11 +0100 Subject: [PATCH] Mark some virtual overrides final These methods are being called from c'tor or from d'tor. Make sure these methods will not get overridden by any possible subclass, otherwise these calls won't be dispatched properly. Change-Id: I3652d2f495940f13b48b494ab2cf06abb3d37e7e Reviewed-by: Eike Ziller --- .../actionmanager/actioncontainer_p.h | 22 +++++++++---------- src/plugins/docker/dockerdevice.cpp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index cac42e39070..14524a6576c 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -28,19 +28,19 @@ public: ActionContainerPrivate(Utils::Id id); ~ActionContainerPrivate() override = default; - void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) override; - ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const override; + void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) final; + ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const final; - QAction *insertLocation(Utils::Id groupId) const override; - void appendGroup(Utils::Id id) override; - void insertGroup(Utils::Id before, Utils::Id groupId) override; - void addAction(Command *action, Utils::Id group = {}) override; - void addMenu(ActionContainer *menu, Utils::Id group = {}) override; - void addMenu(ActionContainer *before, ActionContainer *menu) override; - Command *addSeparator(const Context &context, Utils::Id group = {}, QAction **outSeparator = nullptr) override; - void clear() override; + QAction *insertLocation(Utils::Id groupId) const final; + void appendGroup(Utils::Id id) final; + void insertGroup(Utils::Id before, Utils::Id groupId) final; + void addAction(Command *action, Utils::Id group = {}) final; + void addMenu(ActionContainer *menu, Utils::Id group = {}) final; + void addMenu(ActionContainer *before, ActionContainer *menu) final; + Command *addSeparator(const Context &context, Utils::Id group = {}, QAction **outSeparator = nullptr) final; + void clear() final; - Utils::Id id() const override; + Utils::Id id() const final; QMenu *menu() const override; QMenuBar *menuBar() const override; diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index dd7f8c5d8c7..d2f96aa144e 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -202,7 +202,7 @@ public: private: void start() override; qint64 write(const QByteArray &data) override; - void sendControlSignal(ControlSignal controlSignal) override; + void sendControlSignal(ControlSignal controlSignal) final; private: DockerDevicePrivate *m_devicePrivate = nullptr;