diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index bb9c58eb9..17f024623 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -46,7 +46,7 @@ public: explicit VFormulaPropertyEditor(QWidget *parent); //! Destructor - ~VFormulaPropertyEditor() override Q_DECL_EQ_DEFAULT; + ~VFormulaPropertyEditor() override = default; //! Returns the formula currently set auto GetFormula() const -> VFormula; diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index a562be33e..e1b70b902 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -50,7 +50,7 @@ public: explicit VException(const QString &error) V_NOEXCEPT_EXPR (true); VException(const VException &e) V_NOEXCEPT_EXPR (true); VException &operator=(const VException &e) V_NOEXCEPT_EXPR (true); - virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VException() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override; @@ -103,7 +103,7 @@ public: explicit VExceptionToolWasDeleted(const QString &error) V_NOEXCEPT_EXPR (true); VExceptionToolWasDeleted(const VExceptionToolWasDeleted &e) V_NOEXCEPT_EXPR (true); VExceptionToolWasDeleted &operator=(const VExceptionToolWasDeleted &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override; // cppcheck-suppress unusedFunction diff --git a/src/libs/ifc/exception/vexceptionbadid.h b/src/libs/ifc/exception/vexceptionbadid.h index ab73804d7..a0cca7f0b 100644 --- a/src/libs/ifc/exception/vexceptionbadid.h +++ b/src/libs/ifc/exception/vexceptionbadid.h @@ -46,7 +46,7 @@ public: VExceptionBadId(const QString &error, const QString &key) V_NOEXCEPT_EXPR (true); VExceptionBadId(const VExceptionBadId &e) V_NOEXCEPT_EXPR (true); VExceptionBadId &operator=(const VExceptionBadId &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptionconversionerror.h b/src/libs/ifc/exception/vexceptionconversionerror.h index e44427189..b3be8e2e8 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.h +++ b/src/libs/ifc/exception/vexceptionconversionerror.h @@ -44,7 +44,7 @@ public: VExceptionConversionError(const QString &error, const QString &str) V_NOEXCEPT_EXPR (true); VExceptionConversionError(const VExceptionConversionError &e) V_NOEXCEPT_EXPR (true); VExceptionConversionError &operator=(const VExceptionConversionError &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.h b/src/libs/ifc/exception/vexceptionemptyparameter.h index 36820e692..970290adc 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.h +++ b/src/libs/ifc/exception/vexceptionemptyparameter.h @@ -48,7 +48,7 @@ public: const QDomElement &domElement) V_NOEXCEPT_EXPR (true); VExceptionEmptyParameter(const VExceptionEmptyParameter &e) V_NOEXCEPT_EXPR (true); VExceptionEmptyParameter &operator=(const VExceptionEmptyParameter &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptioninvalidhistory.h b/src/libs/ifc/exception/vexceptioninvalidhistory.h index fa0f5d147..a0059fe76 100644 --- a/src/libs/ifc/exception/vexceptioninvalidhistory.h +++ b/src/libs/ifc/exception/vexceptioninvalidhistory.h @@ -36,7 +36,7 @@ public: explicit VExceptionInvalidHistory(const QString &error) V_NOEXCEPT_EXPR (true); VExceptionInvalidHistory(const VExceptionInvalidHistory &e) V_NOEXCEPT_EXPR (true); VExceptionInvalidHistory &operator=(const VExceptionInvalidHistory &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionInvalidHistory() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionInvalidHistory() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptioninvalidnotch.h b/src/libs/ifc/exception/vexceptioninvalidnotch.h index 32084e2f3..269908d0a 100644 --- a/src/libs/ifc/exception/vexceptioninvalidnotch.h +++ b/src/libs/ifc/exception/vexceptioninvalidnotch.h @@ -36,7 +36,7 @@ public: explicit VExceptionInvalidNotch(const QString &error) V_NOEXCEPT_EXPR (true); VExceptionInvalidNotch(const VExceptionInvalidNotch &e) V_NOEXCEPT_EXPR (true); VExceptionInvalidNotch &operator=(const VExceptionInvalidNotch &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionInvalidNotch() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionInvalidNotch() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptionobjecterror.h b/src/libs/ifc/exception/vexceptionobjecterror.h index 128d2630f..834cfb775 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.h +++ b/src/libs/ifc/exception/vexceptionobjecterror.h @@ -48,7 +48,7 @@ public: explicit VExceptionObjectError(const QString &what) V_NOEXCEPT_EXPR (true); VExceptionObjectError(const VExceptionObjectError &e) V_NOEXCEPT_EXPR (true); VExceptionObjectError &operator=(const VExceptionObjectError &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptionundo.h b/src/libs/ifc/exception/vexceptionundo.h index 36438dcea..00b22ca00 100644 --- a/src/libs/ifc/exception/vexceptionundo.h +++ b/src/libs/ifc/exception/vexceptionundo.h @@ -40,7 +40,7 @@ class VExceptionUndo : public VException public: explicit VExceptionUndo(const QString &what) V_NOEXCEPT_EXPR (true); VExceptionUndo(const VExceptionUndo &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h index 450f0834d..66b97d553 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.h +++ b/src/libs/ifc/exception/vexceptionwrongid.h @@ -47,7 +47,7 @@ public: VExceptionWrongId(const QString &what, const QDomElement &domElement) V_NOEXCEPT_EXPR (true); VExceptionWrongId(const VExceptionWrongId &e) V_NOEXCEPT_EXPR (true); VExceptionWrongId &operator=(const VExceptionWrongId &e) V_NOEXCEPT_EXPR (true); - virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; + virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) = default; Q_NORETURN virtual void raise() const override { throw *this; } diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h index 2229cfd2f..0f42e5b4e 100644 --- a/src/libs/ifc/xml/vabstractconverter.h +++ b/src/libs/ifc/xml/vabstractconverter.h @@ -46,7 +46,7 @@ class VAbstractConverter :public VDomDocument { public: explicit VAbstractConverter(const QString &fileName); - virtual ~VAbstractConverter() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractConverter() = default; QString Convert(); diff --git a/src/libs/ifc/xml/vabstractmconverter.h b/src/libs/ifc/xml/vabstractmconverter.h index eb1e5f26b..de5a7e1bd 100644 --- a/src/libs/ifc/xml/vabstractmconverter.h +++ b/src/libs/ifc/xml/vabstractmconverter.h @@ -41,7 +41,7 @@ class VAbstractMConverter : public VAbstractConverter { public: explicit VAbstractMConverter(const QString &fileName); - virtual ~VAbstractMConverter() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractMConverter() = default; auto Units() const -> Unit; diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.h b/src/libs/ifc/xml/vlabeltemplateconverter.h index d6f35e56b..920134e14 100644 --- a/src/libs/ifc/xml/vlabeltemplateconverter.h +++ b/src/libs/ifc/xml/vlabeltemplateconverter.h @@ -35,7 +35,7 @@ class VLabelTemplateConverter : public VAbstractConverter { public: explicit VLabelTemplateConverter(const QString &fileName); - virtual ~VLabelTemplateConverter() Q_DECL_EQ_DEFAULT; + virtual ~VLabelTemplateConverter() = default; static const QString LabelTemplateMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 5d3228bff..25bcb2c0a 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -48,7 +48,7 @@ class VPatternConverter final : public VAbstractConverter Q_DECLARE_TR_FUNCTIONS(VPatternConverter) // NOLINT public: explicit VPatternConverter(const QString &fileName); - virtual ~VPatternConverter() Q_DECL_EQ_DEFAULT; + virtual ~VPatternConverter() = default; static const QString PatternMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vtoolrecord.h b/src/libs/ifc/xml/vtoolrecord.h index 5a388d25a..4e188585c 100644 --- a/src/libs/ifc/xml/vtoolrecord.h +++ b/src/libs/ifc/xml/vtoolrecord.h @@ -45,7 +45,7 @@ public: bool operator==(const VToolRecord &record) const; VToolRecord &operator=(const VToolRecord &record); VToolRecord(const VToolRecord &record); - ~VToolRecord() Q_DECL_EQ_DEFAULT; + ~VToolRecord() = default; quint32 getId() const; void setId(const quint32 &value); diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index ea74ea7ce..dcb6c6ad3 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -44,7 +44,7 @@ class VVITConverter final : public VAbstractMConverter Q_DECLARE_TR_FUNCTIONS(VVITConverter) // NOLINT public: explicit VVITConverter(const QString &fileName); - virtual ~VVITConverter() Q_DECL_EQ_DEFAULT; + virtual ~VVITConverter() = default; static const QString MeasurementMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 08ea7b6ce..23a749f8d 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -44,7 +44,7 @@ class VVSTConverter final : public VAbstractMConverter Q_DECLARE_TR_FUNCTIONS(VVSTConverter) // NOLINT public: explicit VVSTConverter(const QString &fileName); - virtual ~VVSTConverter() Q_DECL_EQ_DEFAULT; + virtual ~VVSTConverter() = default; static const QString MeasurementMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vwatermarkconverter.h b/src/libs/ifc/xml/vwatermarkconverter.h index 6a10d802b..246dce5b4 100644 --- a/src/libs/ifc/xml/vwatermarkconverter.h +++ b/src/libs/ifc/xml/vwatermarkconverter.h @@ -34,7 +34,7 @@ class VWatermarkConverter final : public VAbstractConverter { public: explicit VWatermarkConverter(const QString &fileName); - virtual ~VWatermarkConverter() Q_DECL_EQ_DEFAULT; + virtual ~VWatermarkConverter() = default; static const QString WatermarkMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/vformat/vlabeltemplate.h b/src/libs/vformat/vlabeltemplate.h index 5970b2cdf..8244c8a97 100644 --- a/src/libs/vformat/vlabeltemplate.h +++ b/src/libs/vformat/vlabeltemplate.h @@ -35,7 +35,7 @@ class VLabelTemplate : public VDomDocument { public: VLabelTemplate(); - virtual ~VLabelTemplate() Q_DECL_EQ_DEFAULT; + virtual ~VLabelTemplate() = default; static const QString TagTemplate; static const QString TagLines; diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h index 312731644..e84114a12 100644 --- a/src/libs/vformat/vmeasurements.h +++ b/src/libs/vformat/vmeasurements.h @@ -54,7 +54,7 @@ public: VMeasurements(Unit unit, VContainer *data); VMeasurements(Unit unit, const QVector &dimensions, VContainer *data); - virtual ~VMeasurements() Q_DECL_EQ_DEFAULT; + virtual ~VMeasurements() = default; virtual void setXMLContent(const QString &fileName) override; virtual bool SaveDocument(const QString &fileName, QString &error) override; diff --git a/src/libs/vformat/vpatternrecipe.h b/src/libs/vformat/vpatternrecipe.h index 46516c4b2..35d2fbdb4 100644 --- a/src/libs/vformat/vpatternrecipe.h +++ b/src/libs/vformat/vpatternrecipe.h @@ -44,7 +44,7 @@ class VPatternRecipe : public VDomDocument Q_DECLARE_TR_FUNCTIONS(VPatternRecipe) // NOLINT public: explicit VPatternRecipe(VAbstractPattern *pattern, QObject *parent = nullptr); - virtual ~VPatternRecipe() Q_DECL_EQ_DEFAULT; + virtual ~VPatternRecipe() = default; private: Q_DISABLE_COPY_MOVE(VPatternRecipe) // NOLINT diff --git a/src/libs/vformat/vwatermark.h b/src/libs/vformat/vwatermark.h index f71251add..102c390f0 100644 --- a/src/libs/vformat/vwatermark.h +++ b/src/libs/vformat/vwatermark.h @@ -36,7 +36,7 @@ class VWatermark : public VDomDocument Q_DECLARE_TR_FUNCTIONS(VWatermark) // NOLINT public: VWatermark(); - virtual ~VWatermark() Q_DECL_EQ_DEFAULT; + virtual ~VWatermark() = default; void CreateEmptyWatermark(); diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h index e17227360..cdec796a0 100644 --- a/src/libs/vlayout/vabstractpiece_p.h +++ b/src/libs/vlayout/vabstractpiece_p.h @@ -69,7 +69,7 @@ public: m_uuid(piece.m_uuid) {} - ~VAbstractPieceData() Q_DECL_EQ_DEFAULT; + ~VAbstractPieceData() = default; friend QDataStream& operator<<(QDataStream& dataStream, const VAbstractPieceData& piece); friend QDataStream& operator>>(QDataStream& dataStream, VAbstractPieceData& piece); diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h index 279be9480..fe9476c56 100644 --- a/src/libs/vlayout/vlayoutpiece_p.h +++ b/src/libs/vlayout/vlayoutpiece_p.h @@ -85,7 +85,7 @@ public: m_yScale(detail.m_yScale) {} - ~VLayoutPieceData() Q_DECL_EQ_DEFAULT; + ~VLayoutPieceData() = default; friend QDataStream& operator<<(QDataStream& dataStream, const VLayoutPieceData& piece); friend QDataStream& operator>>(QDataStream& dataStream, VLayoutPieceData& piece); diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h index 1bd938b90..9bd6513ab 100644 --- a/src/libs/vlayout/vlayoutpiecepath_p.h +++ b/src/libs/vlayout/vlayoutpiecepath_p.h @@ -63,7 +63,7 @@ public: m_cut(path.m_cut) {} - ~VLayoutPiecePathData() Q_DECL_EQ_DEFAULT; + ~VLayoutPiecePathData() = default; friend QDataStream& operator<<(QDataStream& dataStream, const VLayoutPiecePathData& path); friend QDataStream& operator>>(QDataStream& dataStream, VLayoutPiecePathData& path); diff --git a/src/libs/vmisc/qxtcsvmodel.cpp b/src/libs/vmisc/qxtcsvmodel.cpp index ab49d5610..76d4dc082 100644 --- a/src/libs/vmisc/qxtcsvmodel.cpp +++ b/src/libs/vmisc/qxtcsvmodel.cpp @@ -51,7 +51,7 @@ public: QxtCsvModelPrivate() : csvData(), header(), maxColumn(0), quoteMode(QxtCsvModel::DefaultQuoteMode) {} QXT_DECLARE_PUBLIC(QxtCsvModel) - virtual ~QxtCsvModelPrivate() Q_DECL_EQ_DEFAULT; + virtual ~QxtCsvModelPrivate() = default; QList csvData; QStringList header; diff --git a/src/libs/vmisc/qxtcsvmodel.h b/src/libs/vmisc/qxtcsvmodel.h index 4da436b59..846b941c0 100644 --- a/src/libs/vmisc/qxtcsvmodel.h +++ b/src/libs/vmisc/qxtcsvmodel.h @@ -59,7 +59,7 @@ public: QTextCodec *codec = nullptr); explicit QxtCsvModel(const QString &filename, QObject *parent = nullptr, bool withHeader = false, QChar separator = ',', QTextCodec *codec = nullptr); - virtual ~QxtCsvModel() Q_DECL_EQ_DEFAULT; + virtual ~QxtCsvModel() = default; virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override; virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override; diff --git a/src/libs/vmisc/testvapplication.h b/src/libs/vmisc/testvapplication.h index 4695f6126..a50c14f50 100644 --- a/src/libs/vmisc/testvapplication.h +++ b/src/libs/vmisc/testvapplication.h @@ -59,7 +59,7 @@ public: TestVApplication::OpenSettings(); } - virtual ~TestVApplication() Q_DECL_EQ_DEFAULT; + virtual ~TestVApplication() = default; virtual const VTranslateVars *TrVars() override { diff --git a/src/libs/vpatterndb/calculator.h b/src/libs/vpatterndb/calculator.h index 04a4b3c5a..b05411dc7 100644 --- a/src/libs/vpatterndb/calculator.h +++ b/src/libs/vpatterndb/calculator.h @@ -61,7 +61,7 @@ class Calculator final : public qmu::QmuFormulaBase { public: Calculator(); - virtual ~Calculator() Q_DECL_EQ_DEFAULT; + virtual ~Calculator() = default; qreal EvalFormula(const QHash > *vars, const QString &formula); protected: diff --git a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h index 2522c6112..8fedb189b 100644 --- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h +++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h @@ -55,7 +55,7 @@ public: m_bVisible(data.m_bVisible) {} - ~VAbstractFloatItemDataPrivate() Q_DECL_EQ_DEFAULT; + ~VAbstractFloatItemDataPrivate() = default; /** @brief m_ptPos position of label's top left corner */ QPointF m_ptPos; diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h index d1ed2b6a9..3d9376b5d 100644 --- a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h +++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h @@ -65,7 +65,7 @@ public: m_bottomPin(data.m_bottomPin) {} - ~VGrainlineDataPrivate() Q_DECL_EQ_DEFAULT; + ~VGrainlineDataPrivate() = default; /** @brief m_dLength formula to calculate the length of grainline */ QString m_qsLength; diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h index 26d913b11..17cd598a6 100644 --- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h @@ -67,7 +67,7 @@ public: m_bottomRightPin(data.m_bottomRightPin) {} - ~VPatternLabelDataPrivate() Q_DECL_EQ_DEFAULT; + ~VPatternLabelDataPrivate() = default; /** @brief m_dLabelWidth formula to calculate the width of label */ QString m_dLabelWidth; diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h index 31b9910fe..d70224b13 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h @@ -68,7 +68,7 @@ public: m_lines(data.m_lines) {} - ~VPieceLabelDataPrivate() Q_DECL_EQ_DEFAULT; + ~VPieceLabelDataPrivate() = default; /** @brief m_qsLetter Detail letter (should be no more than 3 characters) */ QString m_qsLetter; diff --git a/src/libs/vpatterndb/vpiecenode_p.h b/src/libs/vpatterndb/vpiecenode_p.h index 941918e63..892cd4817 100644 --- a/src/libs/vpatterndb/vpiecenode_p.h +++ b/src/libs/vpatterndb/vpiecenode_p.h @@ -82,7 +82,7 @@ public: m_manualPassmarkLength(node.m_manualPassmarkLength) {} - ~VPieceNodeData() Q_DECL_EQ_DEFAULT; + ~VPieceNodeData() = default; friend QDataStream& operator<<(QDataStream& out, const VPieceNodeData& p); friend QDataStream& operator>>(QDataStream& in, VPieceNodeData& p); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h index 2bc2d3a43..351f63de8 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h @@ -37,7 +37,7 @@ class VAbstractFlipping : public VAbstractOperation { Q_OBJECT // NOLINT public: - virtual ~VAbstractFlipping() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractFlipping() = default; protected: explicit VAbstractFlipping(const VAbstractOperationInitData &initData, QGraphicsItem *parent = nullptr); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h index 020ed62f5..b1c6e3672 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h @@ -49,7 +49,7 @@ class VToolFlippingByAxis : public VAbstractFlipping { Q_OBJECT // NOLINT public: - virtual ~VToolFlippingByAxis() Q_DECL_EQ_DEFAULT; + virtual ~VToolFlippingByAxis() = default; virtual void setDialog() override; static VToolFlippingByAxis* Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h index d90ec72a5..14dd3ea59 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h @@ -50,7 +50,7 @@ class VToolFlippingByLine : public VAbstractFlipping { Q_OBJECT // NOLINT public: - virtual ~VToolFlippingByLine() Q_DECL_EQ_DEFAULT; + virtual ~VToolFlippingByLine() = default; virtual void setDialog() override; static VToolFlippingByLine* Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index 3541ff4cd..0370af6c3 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -75,7 +75,7 @@ class VAbstractOperation : public VDrawTool, public QGraphicsLineItem // in Q_INTERFACES. qobject_cast to QGraphicsItem will not work!" Q_INTERFACES(QGraphicsItem) public: - virtual ~VAbstractOperation() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractOperation() = default; static const QString TagItem; static const QString TagSource; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h index 9f258ec03..cd18be747 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h @@ -65,7 +65,7 @@ class VToolMove : public VAbstractOperation { Q_OBJECT // NOLINT public: - virtual ~VToolMove() Q_DECL_EQ_DEFAULT; + virtual ~VToolMove() = default; virtual void setDialog() override; static VToolMove* Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h index 545283aec..f40889735 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h @@ -61,7 +61,7 @@ class VToolRotation : public VAbstractOperation { Q_OBJECT // NOLINT public: - virtual ~VToolRotation() Q_DECL_EQ_DEFAULT; + virtual ~VToolRotation() = default; virtual void setDialog() override; static VToolRotation* Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index c7f79f72a..e9a5f065b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -75,7 +75,7 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem public: VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QGraphicsItem * parent = nullptr); - virtual ~VAbstractSpline() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractSpline() = default; virtual QPainterPath shape() const override; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h index 49790694e..aa75985df 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h @@ -62,7 +62,7 @@ class VToolCubicBezier : public VAbstractSpline { Q_OBJECT // NOLINT public: - virtual ~VToolCubicBezier() Q_DECL_EQ_DEFAULT; + virtual ~VToolCubicBezier() = default; virtual void setDialog() override; static VToolCubicBezier *Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h index 0ae936554..81814bcc5 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h @@ -62,7 +62,7 @@ class VToolCubicBezierPath:public VAbstractSpline { Q_OBJECT // NOLINT public: - virtual ~VToolCubicBezierPath() Q_DECL_EQ_DEFAULT; + virtual ~VToolCubicBezierPath() = default; virtual void setDialog() override; static VToolCubicBezierPath *Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index d197d9045..e8764b8dd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -50,7 +50,7 @@ class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem public: VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id, const QString ¬es, QGraphicsItem * parent = nullptr); - virtual ~VToolDoublePoint() Q_DECL_EQ_DEFAULT; + virtual ~VToolDoublePoint() = default; virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::DoublePoint)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h index b0aff0f3b..de3565b27 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h @@ -60,7 +60,7 @@ class VToolCurveIntersectAxis : public VToolLinePoint { Q_OBJECT // NOLINT public: - virtual ~VToolCurveIntersectAxis() Q_DECL_EQ_DEFAULT; + virtual ~VToolCurveIntersectAxis() = default; virtual void setDialog() override; static VToolCurveIntersectAxis *Create(const QPointer &dialog, VMainGraphicsScene *scene, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h index 70ee37e41..811342f74 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h @@ -65,7 +65,7 @@ class VToolEndLine : public VToolLinePoint { Q_OBJECT // NOLINT public: - virtual ~VToolEndLine() Q_DECL_EQ_DEFAULT; + virtual ~VToolEndLine() = default; virtual void setDialog() override; static VToolEndLine *Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h index a67d937a3..b2c2ae433 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h @@ -66,7 +66,7 @@ class VToolLineIntersectAxis : public VToolLinePoint { Q_OBJECT // NOLINT public: - virtual ~VToolLineIntersectAxis() Q_DECL_EQ_DEFAULT; + virtual ~VToolLineIntersectAxis() = default; virtual void setDialog() override; static VToolLineIntersectAxis *Create(const QPointer &dialog, VMainGraphicsScene *scene, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index 4d660454f..4402403ec 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -69,7 +69,7 @@ class VToolSinglePoint: public VAbstractPoint, public VScenePoint public: VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QGraphicsItem * parent = nullptr); - virtual ~VToolSinglePoint() Q_DECL_EQ_DEFAULT; + virtual ~VToolSinglePoint() = default; virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::SinglePoint)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index b3557c9c9..20ca6a801 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -54,7 +54,7 @@ class VAbstractPoint: public VDrawTool Q_OBJECT // NOLINT public: VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es); - virtual ~VAbstractPoint() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractPoint() = default; virtual QString getTagName() const override; diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index f05e8935b..1614660d9 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -73,7 +73,7 @@ class VDrawTool : public VInteractiveTool public: VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QObject *parent = nullptr); - virtual ~VDrawTool() Q_DECL_EQ_DEFAULT; + virtual ~VDrawTool() = default; QString getLineType() const; virtual void SetLineType(const QString &value); diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h index dd8b257c4..a385fc078 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h @@ -64,7 +64,7 @@ class VAbstractNode : public VAbstractTool public: VAbstractNode(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &idNode, const QString &drawName = QString(), const quint32 &idTool = 0, QObject *parent = nullptr); - virtual ~VAbstractNode() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractNode() = default; static const QString AttrIdTool; virtual void ShowVisualization(bool show) override; virtual void incrementReferens() override; diff --git a/src/libs/vtools/tools/vdatatool.h b/src/libs/vtools/tools/vdatatool.h index 798157293..05caebc6a 100644 --- a/src/libs/vtools/tools/vdatatool.h +++ b/src/libs/vtools/tools/vdatatool.h @@ -49,7 +49,7 @@ class VDataTool : public QObject Q_OBJECT // NOLINT public: explicit VDataTool(VContainer *data, QObject *parent = nullptr); - virtual ~VDataTool() Q_DECL_EQ_DEFAULT; + virtual ~VDataTool() = default; VContainer getData() const; void setData(const VContainer *value); virtual quint32 referens() const; diff --git a/src/libs/vtools/tools/vinteractivetool.h b/src/libs/vtools/tools/vinteractivetool.h index 413d7ef25..efb59ae40 100644 --- a/src/libs/vtools/tools/vinteractivetool.h +++ b/src/libs/vtools/tools/vinteractivetool.h @@ -39,7 +39,7 @@ class VInteractiveTool : public VAbstractTool Q_OBJECT // NOLINT public: VInteractiveTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr); - virtual ~VInteractiveTool() Q_DECL_EQ_DEFAULT; + virtual ~VInteractiveTool() = default; void DialogLinkDestroy(); diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h index 3fe2206db..83fc2adfe 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.h +++ b/src/libs/vtools/tools/vtoolseamallowance.h @@ -59,7 +59,7 @@ class VToolSeamAllowance : public VInteractiveTool, public QGraphicsPathItem { Q_OBJECT // NOLINT public: - virtual ~VToolSeamAllowance() Q_DECL_EQ_DEFAULT; + virtual ~VToolSeamAllowance() = default; static VToolSeamAllowance* Create(const QPointer &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.h b/src/libs/vwidgets/fancytabbar/fancytabbar.h index a7759a288..2cc44e7d1 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.h +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.h @@ -53,7 +53,7 @@ public: }; explicit FancyTabBar(const TabBarPosition position, QWidget *parent = nullptr); - virtual ~FancyTabBar() Q_DECL_EQ_DEFAULT; + virtual ~FancyTabBar() = default; virtual QSize sizeHint() const override; virtual QSize minimumSizeHint() const override; diff --git a/src/libs/vwidgets/vabstractmainwindow.h b/src/libs/vwidgets/vabstractmainwindow.h index ac46a8991..4c5217df4 100644 --- a/src/libs/vwidgets/vabstractmainwindow.h +++ b/src/libs/vwidgets/vabstractmainwindow.h @@ -51,7 +51,7 @@ class VAbstractMainWindow : public QMainWindow Q_OBJECT // NOLINT public: explicit VAbstractMainWindow(QWidget *parent = nullptr); - virtual ~VAbstractMainWindow() Q_DECL_EQ_DEFAULT; + virtual ~VAbstractMainWindow() = default; public slots: virtual void ShowToolTip(const QString &toolTip); diff --git a/src/libs/vwidgets/vgrainlineitem.h b/src/libs/vwidgets/vgrainlineitem.h index cab63a255..7dfbe82ae 100644 --- a/src/libs/vwidgets/vgrainlineitem.h +++ b/src/libs/vwidgets/vgrainlineitem.h @@ -38,7 +38,7 @@ class VGrainlineItem final : public VPieceItem Q_OBJECT // NOLINT public: explicit VGrainlineItem(QGraphicsItem* pParent = nullptr); - virtual ~VGrainlineItem() Q_DECL_EQ_DEFAULT; + virtual ~VGrainlineItem() = default; virtual QPainterPath shape() const override; diff --git a/src/libs/vwidgets/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h index e5dee6779..e9a2f1613 100644 --- a/src/libs/vwidgets/vsimplecurve.h +++ b/src/libs/vwidgets/vsimplecurve.h @@ -51,7 +51,7 @@ class VSimpleCurve : public VAbstractSimple, public VCurvePathItem Q_OBJECT // NOLINT public: VSimpleCurve(quint32 id, const QSharedPointer &curve, QObject *parent = nullptr); - virtual ~VSimpleCurve() Q_DECL_EQ_DEFAULT; + virtual ~VSimpleCurve() = default; virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::SimpleCurve)}; diff --git a/src/libs/vwidgets/vtextgraphicsitem.h b/src/libs/vwidgets/vtextgraphicsitem.h index 1bf5b8e7e..072e83a52 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.h +++ b/src/libs/vwidgets/vtextgraphicsitem.h @@ -53,7 +53,7 @@ class VTextGraphicsItem final : public VPieceItem Q_OBJECT // NOLINT public: explicit VTextGraphicsItem(QGraphicsItem* pParent = nullptr); - virtual ~VTextGraphicsItem() Q_DECL_EQ_DEFAULT; + virtual ~VTextGraphicsItem() = default; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; virtual void Update() override; diff --git a/src/test/TranslationsTest/tst_buitinregexp.h b/src/test/TranslationsTest/tst_buitinregexp.h index 450596060..e070c7820 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.h +++ b/src/test/TranslationsTest/tst_buitinregexp.h @@ -41,7 +41,7 @@ class TST_BuitInRegExp : public TST_AbstractRegExp Q_OBJECT // NOLINT public: explicit TST_BuitInRegExp(const QString &locale, QObject *parent = nullptr); - virtual ~TST_BuitInRegExp() Q_DECL_EQ_DEFAULT; + virtual ~TST_BuitInRegExp() = default; protected: virtual void PrepareData() override;