From e68e852556bd7b455347988a03c337e18cddbdc8 Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Sun, 28 Aug 2022 00:24:26 +0000
Subject: [PATCH] qt: avoid both virtual and override on dtors
When inheriting from classes with a virtual destructor, it is not needed
to declare the destructor both as virtual and override. In line with the
normal policy for virtual vs override, use virtual only when declaring
the base class destructor.
---
modules/gui/qt/network/networkmediamodel.hpp | 2 +-
modules/gui/qt/network/servicesdiscoverymodel.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt/network/networkmediamodel.hpp b/modules/gui/qt/network/networkmediamodel.hpp
index 727dbb1cc210..62d3d2725080 100644
--- a/modules/gui/qt/network/networkmediamodel.hpp
+++ b/modules/gui/qt/network/networkmediamodel.hpp
@@ -147,7 +147,7 @@ public:
Q_PROPERTY(int count READ getCount NOTIFY countChanged)
explicit NetworkMediaModel(QObject* parent = nullptr);
- virtual ~NetworkMediaModel() override;
+ ~NetworkMediaModel() override;
QVariant data(const QModelIndex& index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
diff --git a/modules/gui/qt/network/servicesdiscoverymodel.hpp b/modules/gui/qt/network/servicesdiscoverymodel.hpp
index 1909f8f00447..949491ad8ba1 100644
--- a/modules/gui/qt/network/servicesdiscoverymodel.hpp
+++ b/modules/gui/qt/network/servicesdiscoverymodel.hpp
@@ -67,7 +67,7 @@ public:
Q_ENUM(Role);
explicit ServicesDiscoveryModel(QObject* parent = nullptr);
- virtual ~ServicesDiscoveryModel() override;
+ ~ServicesDiscoveryModel() override;
QVariant data(const QModelIndex& index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
--
GitLab