aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No reasons for method toJson() to be virtual.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-11-10 15:40:41 +02:00
parent 4c5c22a432
commit accaa68e7a
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.pri
View File

@ -525,8 +525,7 @@ CLANG_DEBUG_CXXFLAGS += \
-Wdeclaration-after-statement \ -Wdeclaration-after-statement \
-Wdelegating-ctor-cycles \ -Wdelegating-ctor-cycles \
-Wdelete-incomplete \ -Wdelete-incomplete \
# -Wdelete-non-virtual-dtor \ Disabled -Wdelete-non-virtual-dtor \
-Wno-delete-non-abstract-non-virtual-dtor \
-Wdeprecated \ -Wdeprecated \
-Wdeprecated-declarations \ -Wdeprecated-declarations \
-Wdeprecated-implementations \ -Wdeprecated-implementations \

3
src/libs/vlayout/vlayoutpoint.h
View File

@ -41,7 +41,6 @@ QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor") QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor")
QT_WARNING_DISABLE_CLANG("-Wdelete-non-virtual-dtor")
class VLayoutPoint : public QPointF class VLayoutPoint : public QPointF
{ {
@ -56,7 +55,7 @@ public:
Q_DECL_RELAXED_CONSTEXPR void SetTurnPoint(bool newTurnPoint); Q_DECL_RELAXED_CONSTEXPR void SetTurnPoint(bool newTurnPoint);
Q_DECL_RELAXED_CONSTEXPR void SetCurvePoint(bool newCurvePoint); Q_DECL_RELAXED_CONSTEXPR void SetCurvePoint(bool newCurvePoint);
virtual auto toJson() const -> QJsonObject; auto toJson() const -> QJsonObject;
private: private:
bool m_turnPoint{false}; bool m_turnPoint{false};

3
src/libs/vlayout/vrawsapoint.h
View File

@ -40,7 +40,6 @@ QT_WARNING_DISABLE_GCC("-Weffc++")
// cppcheck-suppress unknownMacro // cppcheck-suppress unknownMacro
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor") QT_WARNING_DISABLE_CLANG("-Wnon-virtual-dtor")
QT_WARNING_DISABLE_CLANG("-Wdelete-non-virtual-dtor")
class VRawSAPoint final : public VLayoutPoint class VRawSAPoint final : public VLayoutPoint
{ {
@ -58,7 +57,7 @@ public:
Q_DECL_CONSTEXPR auto Primary() const -> bool; Q_DECL_CONSTEXPR auto Primary() const -> bool;
Q_DECL_RELAXED_CONSTEXPR void SetPrimary(bool primary); Q_DECL_RELAXED_CONSTEXPR void SetPrimary(bool primary);
auto toJson() const -> QJsonObject override; auto toJson() const -> QJsonObject;
private: private:
bool m_loopPoint{false}; bool m_loopPoint{false};

3
src/libs/vlayout/vsapoint.h
View File

@ -42,7 +42,6 @@ QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Weffc++")
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
QT_WARNING_DISABLE_CLANG("-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 * @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 MaxLocalSA(qreal width) const -> qreal;
Q_DECL_RELAXED_CONSTEXPR auto PassmarkLength(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 passmarkFactor{0.5};
static constexpr qreal maxPassmarkLength{MmToPixel(10.)}; static constexpr qreal maxPassmarkLength{MmToPixel(10.)};