From accaa68e7afbecf0250f3661ba030c088f000316 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Thu, 10 Nov 2022 15:40:41 +0200
Subject: [PATCH] No reasons for method toJson() to be virtual.

---
 common.pri                      | 3 +--
 src/libs/vlayout/vlayoutpoint.h | 3 +--
 src/libs/vlayout/vrawsapoint.h  | 3 +--
 src/libs/vlayout/vsapoint.h     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/common.pri b/common.pri
index 29a4c901a..6d8df3480 100644
--- a/common.pri
+++ b/common.pri
@@ -525,8 +525,7 @@ CLANG_DEBUG_CXXFLAGS += \
     -Wdeclaration-after-statement \
     -Wdelegating-ctor-cycles \
     -Wdelete-incomplete \
-#   -Wdelete-non-virtual-dtor \ Disabled
-    -Wno-delete-non-abstract-non-virtual-dtor \
+    -Wdelete-non-virtual-dtor \
     -Wdeprecated \
     -Wdeprecated-declarations \
     -Wdeprecated-implementations \
diff --git a/src/libs/vlayout/vlayoutpoint.h b/src/libs/vlayout/vlayoutpoint.h
index e5945b77f..e42d59485 100644
--- a/src/libs/vlayout/vlayoutpoint.h
+++ b/src/libs/vlayout/vlayoutpoint.h
@@ -41,7 +41,6 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor")
-QT_WARNING_DISABLE_CLANG("-Wdelete-non-virtual-dtor")
 
 class VLayoutPoint : public QPointF
 {
@@ -56,7 +55,7 @@ public:
     Q_DECL_RELAXED_CONSTEXPR void SetTurnPoint(bool newTurnPoint);
     Q_DECL_RELAXED_CONSTEXPR void SetCurvePoint(bool newCurvePoint);
 
-    virtual auto toJson() const -> QJsonObject;
+    auto toJson() const -> QJsonObject;
 
 private:
     bool m_turnPoint{false};
diff --git a/src/libs/vlayout/vrawsapoint.h b/src/libs/vlayout/vrawsapoint.h
index 0652f2fd8..118347f7a 100644
--- a/src/libs/vlayout/vrawsapoint.h
+++ b/src/libs/vlayout/vrawsapoint.h
@@ -40,7 +40,6 @@ QT_WARNING_DISABLE_GCC("-Weffc++")
 // cppcheck-suppress unknownMacro
 QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor")
-QT_WARNING_DISABLE_CLANG("-Wdelete-non-virtual-dtor")
 
 class VRawSAPoint final : public VLayoutPoint
 {
@@ -58,7 +57,7 @@ public:
     Q_DECL_CONSTEXPR auto Primary() const -> bool;
     Q_DECL_RELAXED_CONSTEXPR void SetPrimary(bool primary);
 
-    auto toJson() const -> QJsonObject override;
+    auto toJson() const -> QJsonObject;
 
 private:
     bool m_loopPoint{false};
diff --git a/src/libs/vlayout/vsapoint.h b/src/libs/vlayout/vsapoint.h
index b1b27cc7d..c6608e31d 100644
--- a/src/libs/vlayout/vsapoint.h
+++ b/src/libs/vlayout/vsapoint.h
@@ -42,7 +42,6 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor")
-QT_WARNING_DISABLE_CLANG("-Wdelete-non-virtual-dtor")
 
 /**
  * @brief The VSAPoint class seam allowance point
@@ -80,7 +79,7 @@ public:
     Q_DECL_RELAXED_CONSTEXPR auto MaxLocalSA(qreal width) const -> qreal;
     Q_DECL_RELAXED_CONSTEXPR auto PassmarkLength(qreal width) const -> qreal;
 
-    auto toJson() const -> QJsonObject override;
+    auto toJson() const -> QJsonObject;
 
     static constexpr qreal passmarkFactor{0.5};
     static constexpr qreal maxPassmarkLength{MmToPixel(10.)};