From e2383eb500dca1949c35f8510d7e1f2d7a4475e8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 1 Apr 2017 17:27:55 +0300 Subject: [PATCH] Refactoring. Use "=default" instead of the default implementation. --HG-- branch : develop --- src/libs/ifc/exception/vexception.h | 4 ++-- src/libs/ifc/exception/vexceptionbadid.h | 2 +- src/libs/ifc/exception/vexceptionconversionerror.cpp | 4 ---- src/libs/ifc/exception/vexceptionconversionerror.h | 2 +- src/libs/ifc/exception/vexceptionemptyparameter.cpp | 4 ---- src/libs/ifc/exception/vexceptionemptyparameter.h | 2 +- src/libs/ifc/exception/vexceptionobjecterror.h | 2 +- src/libs/ifc/exception/vexceptionundo.cpp | 4 ---- src/libs/ifc/exception/vexceptionundo.h | 2 +- src/libs/ifc/exception/vexceptionwrongid.h | 2 +- src/libs/ifc/xml/vabstractconverter.cpp | 4 ---- src/libs/ifc/xml/vabstractconverter.h | 2 +- src/libs/ifc/xml/vabstractmconverter.cpp | 5 ----- src/libs/ifc/xml/vabstractmconverter.h | 2 +- src/libs/ifc/xml/vabstractpattern.cpp | 4 ---- src/libs/ifc/xml/vabstractpattern.h | 2 +- src/libs/ifc/xml/vdomdocument.cpp | 4 ---- src/libs/ifc/xml/vdomdocument.h | 2 +- src/libs/ifc/xml/vpatternconverter.cpp | 4 ---- src/libs/ifc/xml/vpatternconverter.h | 2 +- src/libs/ifc/xml/vtoolrecord.cpp | 4 ---- src/libs/ifc/xml/vtoolrecord.h | 2 +- src/libs/ifc/xml/vvitconverter.cpp | 4 ---- src/libs/ifc/xml/vvitconverter.h | 2 +- src/libs/ifc/xml/vvstconverter.cpp | 4 ---- src/libs/ifc/xml/vvstconverter.h | 2 +- src/libs/vformat/vmeasurements.cpp | 5 ----- src/libs/vformat/vmeasurements.h | 2 +- src/libs/vlayout/vabstractpiece_p.h | 5 +---- src/libs/vlayout/vlayoutpiecepath_p.h | 5 +---- src/libs/vmisc/qxtcsvmodel.cpp | 8 +------- src/libs/vmisc/qxtcsvmodel.h | 2 +- .../vpatterndb/floatItemData/vabstractfloatitemdata_p.h | 5 +---- src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h | 5 +---- src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h | 5 +---- src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h | 5 +---- .../drawTools/operation/flipping/vabstractflipping.cpp | 5 ----- .../drawTools/operation/flipping/vabstractflipping.h | 2 +- .../drawTools/operation/flipping/vtoolflippingbyaxis.cpp | 5 ----- .../drawTools/operation/flipping/vtoolflippingbyaxis.h | 2 +- .../drawTools/operation/flipping/vtoolflippingbyline.cpp | 5 ----- .../drawTools/operation/flipping/vtoolflippingbyline.h | 2 +- .../tools/drawTools/operation/vabstractoperation.cpp | 5 ----- .../vtools/tools/drawTools/operation/vabstractoperation.h | 2 +- src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp | 5 ----- src/libs/vtools/tools/drawTools/operation/vtoolmove.h | 2 +- .../vtools/tools/drawTools/operation/vtoolrotation.cpp | 4 ---- src/libs/vtools/tools/drawTools/operation/vtoolrotation.h | 2 +- .../vtools/tools/drawTools/toolcurve/vabstractspline.cpp | 4 ---- .../vtools/tools/drawTools/toolcurve/vabstractspline.h | 2 +- .../vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp | 5 ----- .../vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h | 2 +- .../tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp | 5 ----- .../tools/drawTools/toolcurve/vtoolcubicbezierpath.h | 2 +- .../toolpoint/tooldoublepoint/vtooldoublepoint.cpp | 4 ---- .../toolpoint/tooldoublepoint/vtooldoublepoint.h | 2 +- .../toollinepoint/vtoolcurveintersectaxis.cpp | 4 ---- .../toollinepoint/vtoolcurveintersectaxis.h | 2 +- .../toolsinglepoint/toollinepoint/vtoolendline.cpp | 4 ---- .../toolsinglepoint/toollinepoint/vtoolendline.h | 2 +- .../toollinepoint/vtoollineintersectaxis.cpp | 4 ---- .../toollinepoint/vtoollineintersectaxis.h | 2 +- .../toolpoint/toolsinglepoint/vtoolsinglepoint.cpp | 4 ---- .../toolpoint/toolsinglepoint/vtoolsinglepoint.h | 2 +- .../vtools/tools/drawTools/toolpoint/vabstractpoint.cpp | 4 ---- .../vtools/tools/drawTools/toolpoint/vabstractpoint.h | 2 +- src/libs/vtools/tools/nodeDetails/vabstractnode.h | 2 +- src/libs/vtools/tools/vdatatool.cpp | 4 ---- src/libs/vtools/tools/vdatatool.h | 2 +- .../vtools/visualization/line/vistoolshoulderpoint.cpp | 4 ---- src/libs/vtools/visualization/line/vistoolshoulderpoint.h | 4 ++-- src/libs/vtools/visualization/line/vistooltriangle.cpp | 4 ---- src/libs/vtools/visualization/line/vistooltriangle.h | 4 ++-- src/libs/vtools/visualization/line/vistooltruedarts.cpp | 4 ---- src/libs/vtools/visualization/line/vistooltruedarts.h | 4 ++-- src/libs/vtools/visualization/path/vispath.cpp | 4 ---- src/libs/vtools/visualization/path/vispath.h | 4 ++-- src/libs/vtools/visualization/path/vispiecepins.cpp | 5 ----- src/libs/vtools/visualization/path/vispiecepins.h | 2 +- src/libs/vtools/visualization/path/vistoolarc.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolarc.h | 4 ++-- .../vtools/visualization/path/vistoolarcwithlength.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolarcwithlength.h | 4 ++-- src/libs/vtools/visualization/path/vistoolcubicbezier.cpp | 5 ----- src/libs/vtools/visualization/path/vistoolcubicbezier.h | 2 +- src/libs/vtools/visualization/path/vistoolcutarc.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolcutarc.h | 4 ++-- src/libs/vtools/visualization/path/vistoolcutspline.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolcutspline.h | 4 ++-- .../vtools/visualization/path/vistoolcutsplinepath.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolcutsplinepath.h | 4 ++-- .../vtools/visualization/path/vistoolellipticalarc.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolellipticalarc.h | 4 ++-- src/libs/vtools/visualization/path/vistoolpiece.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolpiece.h | 2 +- src/libs/vtools/visualization/path/vistoolpiecepath.cpp | 4 ---- src/libs/vtools/visualization/path/vistoolpiecepath.h | 2 +- .../visualization/path/vistoolpointofintersectioncurves.h | 4 ++-- src/libs/vtools/visualization/visualization.cpp | 4 ---- src/libs/vtools/visualization/visualization.h | 2 +- src/libs/vwidgets/fancytabbar/fancytabbar.cpp | 5 ----- src/libs/vwidgets/fancytabbar/fancytabbar.h | 2 +- src/libs/vwidgets/vgrainlineitem.cpp | 7 ------- src/libs/vwidgets/vgrainlineitem.h | 2 +- src/libs/vwidgets/vtextgraphicsitem.cpp | 7 ------- src/libs/vwidgets/vtextgraphicsitem.h | 2 +- src/test/TranslationsTest/tst_buitinregexp.cpp | 5 ----- src/test/TranslationsTest/tst_buitinregexp.h | 2 +- src/test/ValentinaTest/qttestmainlambda.cpp | 7 +------ 109 files changed, 74 insertions(+), 310 deletions(-) diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index cd18497d9..3b240a3a9 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -46,7 +46,7 @@ public: explicit VException(const QString &error); VException(const VException &e); VException &operator=(const VException &e); - virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction @@ -96,7 +96,7 @@ public: explicit VExceptionToolWasDeleted(const QString &error); VExceptionToolWasDeleted(const VExceptionToolWasDeleted &e); VExceptionToolWasDeleted &operator=(const VExceptionToolWasDeleted &e); - virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction diff --git a/src/libs/ifc/exception/vexceptionbadid.h b/src/libs/ifc/exception/vexceptionbadid.h index 57ad59c5d..3e40eeaf9 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); VExceptionBadId(const VExceptionBadId &e); VExceptionBadId &operator=(const VExceptionBadId &e); - virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; virtual QString ErrorMessage() const Q_DECL_OVERRIDE; quint32 BadId() const; QString BadKey() const; diff --git a/src/libs/ifc/exception/vexceptionconversionerror.cpp b/src/libs/ifc/exception/vexceptionconversionerror.cpp index 3e6150411..6da231167 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.cpp +++ b/src/libs/ifc/exception/vexceptionconversionerror.cpp @@ -53,10 +53,6 @@ VExceptionConversionError::VExceptionConversionError(const VExceptionConversionE :VException(e), str(e.String()) {} -//--------------------------------------------------------------------------------------------------------------------- -VExceptionConversionError::~VExceptionConversionError() V_NOEXCEPT_EXPR (true) -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief ErrorMessage return main error message diff --git a/src/libs/ifc/exception/vexceptionconversionerror.h b/src/libs/ifc/exception/vexceptionconversionerror.h index 8604fbb3e..821e61314 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.h +++ b/src/libs/ifc/exception/vexceptionconversionerror.h @@ -43,7 +43,7 @@ class VExceptionConversionError : public VException public: VExceptionConversionError(const QString &error, const QString &str); VExceptionConversionError(const VExceptionConversionError &e); - virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; + virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; virtual QString ErrorMessage() const Q_DECL_OVERRIDE; QString String() const; protected: diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.cpp b/src/libs/ifc/exception/vexceptionemptyparameter.cpp index c2f1941c1..88384a378 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.cpp +++ b/src/libs/ifc/exception/vexceptionemptyparameter.cpp @@ -61,10 +61,6 @@ VExceptionEmptyParameter::VExceptionEmptyParameter(const VExceptionEmptyParamete :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()) {} -//--------------------------------------------------------------------------------------------------------------------- -VExceptionEmptyParameter::~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief ErrorMessage return main error message diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.h b/src/libs/ifc/exception/vexceptionemptyparameter.h index 773b12637..32c525ff9 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.h +++ b/src/libs/ifc/exception/vexceptionemptyparameter.h @@ -47,7 +47,7 @@ public: VExceptionEmptyParameter(const QString &error, const QString &name, const QDomElement &domElement); VExceptionEmptyParameter(const VExceptionEmptyParameter &e); - virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; + virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; virtual QString ErrorMessage() const Q_DECL_OVERRIDE; virtual QString DetailedInformation() const Q_DECL_OVERRIDE; QString Name() const; diff --git a/src/libs/ifc/exception/vexceptionobjecterror.h b/src/libs/ifc/exception/vexceptionobjecterror.h index 6eb5ac2ec..84ce7aeeb 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.h +++ b/src/libs/ifc/exception/vexceptionobjecterror.h @@ -46,7 +46,7 @@ class VExceptionObjectError : public VException public: VExceptionObjectError(const QString &error, const QDomElement &domElement); VExceptionObjectError(const VExceptionObjectError &e); - virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; virtual QString ErrorMessage() const Q_DECL_OVERRIDE; virtual QString DetailedInformation() const Q_DECL_OVERRIDE; QString TagText() const; diff --git a/src/libs/ifc/exception/vexceptionundo.cpp b/src/libs/ifc/exception/vexceptionundo.cpp index 4dc54f23c..987fd869b 100644 --- a/src/libs/ifc/exception/vexceptionundo.cpp +++ b/src/libs/ifc/exception/vexceptionundo.cpp @@ -39,7 +39,3 @@ VExceptionUndo::VExceptionUndo(const QString &what) VExceptionUndo::VExceptionUndo(const VExceptionUndo &e) :VException(e) {} - -//--------------------------------------------------------------------------------------------------------------------- -VExceptionUndo::~VExceptionUndo() V_NOEXCEPT_EXPR (true) -{} diff --git a/src/libs/ifc/exception/vexceptionundo.h b/src/libs/ifc/exception/vexceptionundo.h index a67e0f560..f5bcfea11 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 &error); VExceptionUndo(const VExceptionUndo &e); - virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; + virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; }; #endif // VEXCEPTIONUNDO_H diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h index 7c4712afd..1c35369ef 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.h +++ b/src/libs/ifc/exception/vexceptionwrongid.h @@ -46,7 +46,7 @@ class VExceptionWrongId : public VException public: VExceptionWrongId(const QString &error, const QDomElement &domElement); VExceptionWrongId(const VExceptionWrongId &e); - virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; virtual QString ErrorMessage() const Q_DECL_OVERRIDE; virtual QString DetailedInformation() const Q_DECL_OVERRIDE; QString TagText() const; diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp index 9b6e2bde4..69f416f8d 100644 --- a/src/libs/ifc/xml/vabstractconverter.cpp +++ b/src/libs/ifc/xml/vabstractconverter.cpp @@ -58,10 +58,6 @@ VAbstractConverter::VAbstractConverter(const QString &fileName) m_ver = GetVersion(GetVersionStr()); } -//--------------------------------------------------------------------------------------------------------------------- -VAbstractConverter::~VAbstractConverter() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VAbstractConverter::Convert() { diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h index 8872b7f1c..67503f775 100644 --- a/src/libs/ifc/xml/vabstractconverter.h +++ b/src/libs/ifc/xml/vabstractconverter.h @@ -51,7 +51,7 @@ class VAbstractConverter :public VDomDocument Q_DECLARE_TR_FUNCTIONS(VAbstractConverter) public: explicit VAbstractConverter(const QString &fileName); - virtual ~VAbstractConverter() Q_DECL_OVERRIDE; + virtual ~VAbstractConverter() Q_DECL_EQ_DEFAULT; QString Convert(); diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp index a68f30698..14a3fe2b3 100644 --- a/src/libs/ifc/xml/vabstractmconverter.cpp +++ b/src/libs/ifc/xml/vabstractmconverter.cpp @@ -41,11 +41,6 @@ VAbstractMConverter::VAbstractMConverter(const QString &fileName) { } -//--------------------------------------------------------------------------------------------------------------------- -VAbstractMConverter::~VAbstractMConverter() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VAbstractMConverter::AddRootComment() { diff --git a/src/libs/ifc/xml/vabstractmconverter.h b/src/libs/ifc/xml/vabstractmconverter.h index 85f3525dc..bf7a573cf 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_OVERRIDE; + virtual ~VAbstractMConverter() Q_DECL_EQ_DEFAULT; protected: void AddRootComment(); diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index c6ecc35e9..722bea0b2 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -205,10 +205,6 @@ VAbstractPattern::VAbstractPattern(QObject *parent) modified(false) {} -//--------------------------------------------------------------------------------------------------------------------- -VAbstractPattern::~VAbstractPattern() -{} - //--------------------------------------------------------------------------------------------------------------------- QStringList VAbstractPattern::ListMeasurements() const { diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 30f0bdd21..37bd0f7a8 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -65,7 +65,7 @@ class VAbstractPattern : public QObject, public VDomDocument Q_OBJECT public: explicit VAbstractPattern(QObject *parent = nullptr); - virtual ~VAbstractPattern() Q_DECL_OVERRIDE; + virtual ~VAbstractPattern() Q_DECL_EQ_DEFAULT; QStringList ListMeasurements() const; diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index e53d4a93b..dbd533dea 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -136,10 +136,6 @@ VDomDocument::VDomDocument() map() {} -//--------------------------------------------------------------------------------------------------------------------- -VDomDocument::~VDomDocument() -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief Finds an element by id. diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h index 540be9aea..fce5566f3 100644 --- a/src/libs/ifc/xml/vdomdocument.h +++ b/src/libs/ifc/xml/vdomdocument.h @@ -89,7 +89,7 @@ public: static const QString TagVersion; VDomDocument(); - virtual ~VDomDocument(); + virtual ~VDomDocument() Q_DECL_EQ_DEFAULT; QDomElement elementById(const QString& id); QDomElement elementById(quint32 id); diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 3019d03dc..45d6df477 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -143,10 +143,6 @@ VPatternConverter::VPatternConverter(const QString &fileName) ValidateInputFile(CurrentSchema); } -//--------------------------------------------------------------------------------------------------------------------- -VPatternConverter::~VPatternConverter() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VPatternConverter::XSDSchema(int ver) const { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index cb70cf7eb..bef07bc2b 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -48,7 +48,7 @@ class VPatternConverter : public VAbstractConverter Q_DECLARE_TR_FUNCTIONS(VPatternConverter) public: explicit VPatternConverter(const QString &fileName); - virtual ~VPatternConverter() Q_DECL_OVERRIDE; + virtual ~VPatternConverter() Q_DECL_EQ_DEFAULT; static const QString PatternMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vtoolrecord.cpp b/src/libs/ifc/xml/vtoolrecord.cpp index 29613afc4..4ad60c5e5 100644 --- a/src/libs/ifc/xml/vtoolrecord.cpp +++ b/src/libs/ifc/xml/vtoolrecord.cpp @@ -77,7 +77,3 @@ VToolRecord &VToolRecord::operator=(const VToolRecord &record) VToolRecord::VToolRecord(const VToolRecord &record) :id(record.getId()), typeTool(record.getTypeTool()), nameDraw(record.getNameDraw()) {} - -//--------------------------------------------------------------------------------------------------------------------- -VToolRecord::~VToolRecord() -{} diff --git a/src/libs/ifc/xml/vtoolrecord.h b/src/libs/ifc/xml/vtoolrecord.h index 6ac60be6d..27fa4e820 100644 --- a/src/libs/ifc/xml/vtoolrecord.h +++ b/src/libs/ifc/xml/vtoolrecord.h @@ -51,7 +51,7 @@ public: void setTypeTool(const Tool &value); QString getNameDraw() const; void setNameDraw(const QString &value); - ~VToolRecord(); + ~VToolRecord() Q_DECL_EQ_DEFAULT; private: /** @brief id tool id. */ quint32 id; diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp index f33157411..5b390f8c4 100644 --- a/src/libs/ifc/xml/vvitconverter.cpp +++ b/src/libs/ifc/xml/vvitconverter.cpp @@ -69,10 +69,6 @@ VVITConverter::VVITConverter(const QString &fileName) ValidateInputFile(CurrentSchema); } -//--------------------------------------------------------------------------------------------------------------------- -VVITConverter::~VVITConverter() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VVITConverter::XSDSchema(int ver) const { diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index 8516f2eeb..6df49c884 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -44,7 +44,7 @@ class VVITConverter : public VAbstractMConverter Q_DECLARE_TR_FUNCTIONS(VVITConverter) public: explicit VVITConverter(const QString &fileName); - virtual ~VVITConverter() Q_DECL_OVERRIDE; + virtual ~VVITConverter() Q_DECL_EQ_DEFAULT; static const QString MeasurementMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index 5cc95dc4f..74454c25a 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -69,10 +69,6 @@ VVSTConverter::VVSTConverter(const QString &fileName) ValidateInputFile(CurrentSchema); } -//--------------------------------------------------------------------------------------------------------------------- -VVSTConverter::~VVSTConverter() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VVSTConverter::XSDSchema(int ver) const { diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 5d20be30d..2178302d8 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -44,7 +44,7 @@ class VVSTConverter : public VAbstractMConverter Q_DECLARE_TR_FUNCTIONS(VVSTConverter) public: explicit VVSTConverter(const QString &fileName); - virtual ~VVSTConverter() Q_DECL_OVERRIDE; + virtual ~VVSTConverter() Q_DECL_EQ_DEFAULT; static const QString MeasurementMaxVerStr; static const QString CurrentSchema; diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index a0de35275..b7639ba0b 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -115,11 +115,6 @@ VMeasurements::VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer CreateEmptyStandardFile(unit, baseSize, baseHeight); } -//--------------------------------------------------------------------------------------------------------------------- -VMeasurements::~VMeasurements() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VMeasurements::setXMLContent(const QString &fileName) { diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h index 411d5198c..a480c1dd9 100644 --- a/src/libs/vformat/vmeasurements.h +++ b/src/libs/vformat/vmeasurements.h @@ -49,7 +49,7 @@ public: explicit VMeasurements(VContainer *data); VMeasurements(Unit unit, VContainer *data); VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data); - virtual ~VMeasurements() Q_DECL_OVERRIDE; + virtual ~VMeasurements() Q_DECL_EQ_DEFAULT; virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE; diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h index c99abd5c0..96440d352 100644 --- a/src/libs/vlayout/vabstractpiece_p.h +++ b/src/libs/vlayout/vabstractpiece_p.h @@ -57,7 +57,7 @@ public: m_width(piece.m_width) {} - ~VAbstractPieceData(); + ~VAbstractPieceData() Q_DECL_EQ_DEFAULT; QString m_name; /** @brief forbidFlipping forbid piece be mirrored in a layout. */ @@ -69,9 +69,6 @@ private: VAbstractPieceData &operator=(const VAbstractPieceData &) Q_DECL_EQ_DELETE; }; -VAbstractPieceData::~VAbstractPieceData() -{} - QT_WARNING_POP #endif // VABSTRACTPIECE_P_H diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h index 17c4fe8bc..ccdc9f9b1 100644 --- a/src/libs/vlayout/vlayoutpiecepath_p.h +++ b/src/libs/vlayout/vlayoutpiecepath_p.h @@ -57,7 +57,7 @@ public: m_penStyle(path.m_penStyle) {} - ~VLayoutPiecePathData(); + ~VLayoutPiecePathData() Q_DECL_EQ_DEFAULT; /** @brief m_points list of path points. */ QVector m_points; @@ -69,9 +69,6 @@ private: VLayoutPiecePathData &operator=(const VLayoutPiecePathData &) Q_DECL_EQ_DELETE; }; -VLayoutPiecePathData::~VLayoutPiecePathData() -{} - QT_WARNING_POP #endif // VLAYOUTPIECEPATH_P_H diff --git a/src/libs/vmisc/qxtcsvmodel.cpp b/src/libs/vmisc/qxtcsvmodel.cpp index f76d3e168..230b86ef9 100644 --- a/src/libs/vmisc/qxtcsvmodel.cpp +++ b/src/libs/vmisc/qxtcsvmodel.cpp @@ -48,7 +48,7 @@ public: QxtCsvModelPrivate() : csvData(), header(), maxColumn(0), quoteMode(QxtCsvModel::DefaultQuoteMode) {} QXT_DECLARE_PUBLIC(QxtCsvModel) - virtual ~QxtCsvModelPrivate(); + virtual ~QxtCsvModelPrivate() Q_DECL_EQ_DEFAULT; QList csvData; QStringList header; @@ -59,9 +59,6 @@ private: Q_DISABLE_COPY(QxtCsvModelPrivate) }; -QxtCsvModelPrivate::~QxtCsvModelPrivate() -{} - QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") @@ -108,9 +105,6 @@ QxtCsvModel::QxtCsvModel(const QString &filename, QObject *parent, bool withHead QT_WARNING_POP -QxtCsvModel::~QxtCsvModel() -{} - /*! \reimp */ diff --git a/src/libs/vmisc/qxtcsvmodel.h b/src/libs/vmisc/qxtcsvmodel.h index b35076cd4..b43a6c340 100644 --- a/src/libs/vmisc/qxtcsvmodel.h +++ b/src/libs/vmisc/qxtcsvmodel.h @@ -58,7 +58,7 @@ public: explicit QxtCsvModel(QIODevice *file, QObject *parent = nullptr, bool withHeader = false, QChar separator = ','); explicit QxtCsvModel(const QString &filename, QObject *parent = nullptr, bool withHeader = false, QChar separator = ','); - virtual ~QxtCsvModel(); + virtual ~QxtCsvModel() Q_DECL_EQ_DEFAULT; virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; virtual int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; diff --git a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h index 4e8c81010..089ed1180 100644 --- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h +++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h @@ -51,7 +51,7 @@ public: m_bVisible(data.m_bVisible) {} - ~VAbstractFloatItemDataPrivate(); + ~VAbstractFloatItemDataPrivate() Q_DECL_EQ_DEFAULT; /** @brief m_ptPos position of label's top left corner */ QPointF m_ptPos; @@ -62,9 +62,6 @@ private: VAbstractFloatItemDataPrivate &operator=(const VAbstractFloatItemDataPrivate &) Q_DECL_EQ_DELETE; }; -VAbstractFloatItemDataPrivate::~VAbstractFloatItemDataPrivate() -{} - QT_WARNING_POP #endif // VABSTRACTFLOATITEMDATA_P_H diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h index 5f336dfad..7ddedddaf 100644 --- a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h +++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h @@ -61,7 +61,7 @@ public: m_bottomPin(data.m_bottomPin) {} - ~VGrainlineDataPrivate(); + ~VGrainlineDataPrivate() Q_DECL_EQ_DEFAULT; /** @brief m_dLength formula to calculate the length of grainline */ QString m_qsLength; @@ -80,9 +80,6 @@ private: VGrainlineDataPrivate &operator=(const VGrainlineDataPrivate &) Q_DECL_EQ_DELETE; }; -VGrainlineDataPrivate::~VGrainlineDataPrivate() -{} - QT_WARNING_POP #endif // VGRAINLINEDATA_P_H diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h index 17859d696..ba6f7c74c 100644 --- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h @@ -62,7 +62,7 @@ public: m_bottomRightPin(data.m_bottomRightPin) {} - ~VPatternLabelDataPrivate(); + ~VPatternLabelDataPrivate() Q_DECL_EQ_DEFAULT; /** @brief m_dLabelWidth formula to calculate the width of label */ QString m_dLabelWidth; @@ -83,9 +83,6 @@ private: VPatternLabelDataPrivate &operator=(const VPatternLabelDataPrivate &) Q_DECL_EQ_DELETE; }; -VPatternLabelDataPrivate::~VPatternLabelDataPrivate() -{} - QT_WARNING_POP #endif // VPATTERNLABELDATA_P_H diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h index 7d02f96b6..8ed73a4da 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h @@ -52,7 +52,7 @@ public: m_conMCP(data.m_conMCP) {} - ~VPieceLabelDataPrivate(); + ~VPieceLabelDataPrivate() Q_DECL_EQ_DEFAULT; /** @brief m_qsLetter Detail letter (should be no more than 3 characters) */ QString m_qsLetter; @@ -63,9 +63,6 @@ private: VPieceLabelDataPrivate &operator=(const VPieceLabelDataPrivate &) Q_DECL_EQ_DELETE; }; -VPieceLabelDataPrivate::~VPieceLabelDataPrivate() -{} - QT_WARNING_POP #endif // VPIECELABELDATA_P_H diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp index 3b1015100..f37fc9c1c 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp @@ -37,11 +37,6 @@ #include "../vgeometry/vspline.h" #include "../vgeometry/vsplinepath.h" -//--------------------------------------------------------------------------------------------------------------------- -VAbstractFlipping::~VAbstractFlipping() -{ -} - //--------------------------------------------------------------------------------------------------------------------- VAbstractFlipping::VAbstractFlipping(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, const QVector &source, const QVector &destination, diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h index b35e6cd24..f9f3558b2 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 public: - virtual ~VAbstractFlipping(); + virtual ~VAbstractFlipping() Q_DECL_EQ_DEFAULT; protected: VAbstractFlipping(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, const QVector &source, const QVector &destination, diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index 7fe41df49..d565ec12b 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -66,11 +66,6 @@ template class QSharedPointer; const QString VToolFlippingByAxis::ToolType = QStringLiteral("flippingByAxis"); -//--------------------------------------------------------------------------------------------------------------------- -VToolFlippingByAxis::~VToolFlippingByAxis() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByAxis::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h index bc911d234..d48af2e0d 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h @@ -37,7 +37,7 @@ class VToolFlippingByAxis : public VAbstractFlipping { Q_OBJECT public: - virtual ~VToolFlippingByAxis(); + virtual ~VToolFlippingByAxis() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolFlippingByAxis* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index 127832567..7cee93cb2 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -66,11 +66,6 @@ template class QSharedPointer; const QString VToolFlippingByLine::ToolType = QStringLiteral("flippingByLine"); -//--------------------------------------------------------------------------------------------------------------------- -VToolFlippingByLine::~VToolFlippingByLine() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByLine::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h index d355b1666..53e2c58bd 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h @@ -37,7 +37,7 @@ class VToolFlippingByLine : public VAbstractFlipping { Q_OBJECT public: - virtual ~VToolFlippingByLine(); + virtual ~VToolFlippingByLine() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolFlippingByLine* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp index 10fbbfa33..b9ccc0a57 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp @@ -34,11 +34,6 @@ const QString VAbstractOperation::TagItem = QStringLiteral("item"); const QString VAbstractOperation::TagSource = QStringLiteral("source"); const QString VAbstractOperation::TagDestination = QStringLiteral("destination"); -//--------------------------------------------------------------------------------------------------------------------- -VAbstractOperation::~VAbstractOperation() -{ -} - //--------------------------------------------------------------------------------------------------------------------- QString VAbstractOperation::getTagName() const { diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index 33021ba37..7e57adde6 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -59,7 +59,7 @@ class VAbstractOperation : public VDrawTool, public QGraphicsLineItem // in Q_INTERFACES. qobject_cast to QGraphicsItem will not work!" Q_INTERFACES(QGraphicsItem) public: - virtual ~VAbstractOperation(); + virtual ~VAbstractOperation() Q_DECL_EQ_DEFAULT; static const QString TagItem; static const QString TagSource; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index 6a53541af..c24ede37a 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp @@ -74,11 +74,6 @@ template class QSharedPointer; const QString VToolMove::ToolType = QStringLiteral("moving"); -//--------------------------------------------------------------------------------------------------------------------- -VToolMove::~VToolMove() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VToolMove::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h index 699debd6e..875368152 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h @@ -49,7 +49,7 @@ class VToolMove : public VAbstractOperation { Q_OBJECT public: - virtual ~VToolMove(); + virtual ~VToolMove() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolMove* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index 7a54b5ea8..7a1207d67 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -92,10 +92,6 @@ VToolRotation::VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolRotation::~VToolRotation() -{} - //--------------------------------------------------------------------------------------------------------------------- void VToolRotation::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h index 8438d8660..6fd08cfdf 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h @@ -49,7 +49,7 @@ class VToolRotation : public VAbstractOperation { Q_OBJECT public: - virtual ~VToolRotation(); + virtual ~VToolRotation() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolRotation* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 835e8cb18..f87cadde9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -62,10 +62,6 @@ VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint3 setAcceptHoverEvents(true); } -//--------------------------------------------------------------------------------------------------------------------- -VAbstractSpline::~VAbstractSpline() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VAbstractSpline::getTagName() const { diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index b71dd6012..f91b5b674 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -59,7 +59,7 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem Q_OBJECT public: VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); - virtual ~VAbstractSpline() Q_DECL_OVERRIDE; + virtual ~VAbstractSpline() Q_DECL_EQ_DEFAULT; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::AbstractSpline)}; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index 31ac52704..a03fa90ce 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -70,11 +70,6 @@ VToolCubicBezier::VToolCubicBezier(VAbstractPattern *doc, VContainer *data, quin ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolCubicBezier::~VToolCubicBezier() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezier::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h index 480363b81..701583d33 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h @@ -47,7 +47,7 @@ class VToolCubicBezier : public VAbstractSpline { Q_OBJECT public: - virtual ~VToolCubicBezier(); + virtual ~VToolCubicBezier() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolCubicBezier *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index 58dd025de..da6ae3e38 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -72,11 +72,6 @@ VToolCubicBezierPath::VToolCubicBezierPath(VAbstractPattern *doc, VContainer *da ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolCubicBezierPath::~VToolCubicBezierPath() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezierPath::setDialog() { diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h index 72fbfe334..209a597de 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h @@ -47,7 +47,7 @@ class VToolCubicBezierPath:public VAbstractSpline { Q_OBJECT public: - virtual ~VToolCubicBezierPath(); + virtual ~VToolCubicBezierPath() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolCubicBezierPath *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index 6da332a60..85aa7d3d3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -78,10 +78,6 @@ VToolDoublePoint::VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quin secondPoint->RefreshGeometry(*VAbstractTool::data.GeometricObject(p2id)); } -//--------------------------------------------------------------------------------------------------------------------- -VToolDoublePoint::~VToolDoublePoint() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VToolDoublePoint::nameP1() const { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index eec49a6b8..e40584e22 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -51,7 +51,7 @@ class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem public: VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id, QGraphicsItem * parent = nullptr); - virtual ~VToolDoublePoint() Q_DECL_OVERRIDE; + virtual ~VToolDoublePoint() Q_DECL_EQ_DEFAULT; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::DoublePoint)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index d6248f9f6..10a0bdb30 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -81,10 +81,6 @@ VToolCurveIntersectAxis::VToolCurveIntersectAxis(VAbstractPattern *doc, VContain ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolCurveIntersectAxis::~VToolCurveIntersectAxis() -{} - //--------------------------------------------------------------------------------------------------------------------- void VToolCurveIntersectAxis::setDialog() { 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 60c1dd9b0..841c0c276 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h @@ -50,7 +50,7 @@ class VToolCurveIntersectAxis : public VToolLinePoint { Q_OBJECT public: - virtual ~VToolCurveIntersectAxis() Q_DECL_OVERRIDE; + virtual ~VToolCurveIntersectAxis() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolCurveIntersectAxis *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 8ab7f3e0b..79bddfdd0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -78,10 +78,6 @@ VToolEndLine::VToolEndLine(VAbstractPattern *doc, VContainer *data, const quint3 ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolEndLine::~VToolEndLine() -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief setDialog set dialog when user want change tool option. 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 2502b5152..c023cdfa8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h @@ -51,7 +51,7 @@ class VToolEndLine : public VToolLinePoint { Q_OBJECT public: - virtual ~VToolEndLine() Q_DECL_OVERRIDE; + virtual ~VToolEndLine() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolEndLine *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 80784ded4..db7f129d1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -67,10 +67,6 @@ VToolLineIntersectAxis::VToolLineIntersectAxis(VAbstractPattern *doc, VContainer ToolCreation(typeCreation); } -//--------------------------------------------------------------------------------------------------------------------- -VToolLineIntersectAxis::~VToolLineIntersectAxis() -{} - //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersectAxis::setDialog() { 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 20d3a56be..0374da11a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h @@ -50,7 +50,7 @@ class VToolLineIntersectAxis : public VToolLinePoint { Q_OBJECT public: - virtual ~VToolLineIntersectAxis() Q_DECL_OVERRIDE; + virtual ~VToolLineIntersectAxis() Q_DECL_EQ_DEFAULT; virtual void setDialog() Q_DECL_OVERRIDE; static VToolLineIntersectAxis *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index efb7659f0..47cf50a70 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -92,10 +92,6 @@ VToolSinglePoint::VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quin RefreshPointGeometry(*VAbstractTool::data.GeometricObject(id)); } -//--------------------------------------------------------------------------------------------------------------------- -VToolSinglePoint::~VToolSinglePoint() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VToolSinglePoint::name() const { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index ea10559ea..a3dd9ff73 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -52,7 +52,7 @@ class VToolSinglePoint: public VAbstractPoint, public QGraphicsEllipseItem Q_OBJECT public: VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); - virtual ~VToolSinglePoint() Q_DECL_OVERRIDE; + virtual ~VToolSinglePoint() Q_DECL_EQ_DEFAULT; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::SinglePoint)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index fe68f5daf..cce28cad1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -40,10 +40,6 @@ VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 :VDrawTool(doc, data, id) {} -//--------------------------------------------------------------------------------------------------------------------- -VAbstractPoint::~VAbstractPoint() -{} - //--------------------------------------------------------------------------------------------------------------------- QString VAbstractPoint::getTagName() const { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index 006cb2c97..36d41fd6a 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 public: VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id); - virtual ~VAbstractPoint() Q_DECL_OVERRIDE; + virtual ~VAbstractPoint() Q_DECL_EQ_DEFAULT; virtual QString getTagName() const Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h index fa666b9c2..3af8b0124 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h @@ -50,7 +50,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_OVERRIDE {} + virtual ~VAbstractNode() Q_DECL_EQ_DEFAULT; static const QString AttrIdTool; virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; virtual void incrementReferens() Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/vdatatool.cpp b/src/libs/vtools/tools/vdatatool.cpp index 3c3227ea5..221885a6a 100644 --- a/src/libs/vtools/tools/vdatatool.cpp +++ b/src/libs/vtools/tools/vdatatool.cpp @@ -44,10 +44,6 @@ VDataTool::VDataTool(VContainer *data, QObject *parent) SCASSERT(data != nullptr) } -//--------------------------------------------------------------------------------------------------------------------- -VDataTool::~VDataTool() -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief decrementReferens decrement referens. diff --git a/src/libs/vtools/tools/vdatatool.h b/src/libs/vtools/tools/vdatatool.h index f180ef80d..baadcdac4 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 public: explicit VDataTool(VContainer *data, QObject *parent = nullptr); - virtual ~VDataTool() Q_DECL_OVERRIDE; + virtual ~VDataTool() Q_DECL_EQ_DEFAULT; VContainer getData() const; void setData(const VContainer *value); virtual quint32 referens() const; diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp index a99df407b..3e63c1043 100644 --- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.cpp @@ -59,10 +59,6 @@ VisToolShoulderPoint::VisToolShoulderPoint(const VContainer *data, QGraphicsItem point = InitPoint(mainColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolShoulderPoint::~VisToolShoulderPoint() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolShoulderPoint::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h index f3c363a0e..4e3280fe3 100644 --- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h @@ -43,8 +43,8 @@ class VisToolShoulderPoint : public VisLine { Q_OBJECT public: - explicit VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolShoulderPoint() Q_DECL_OVERRIDE; + explicit VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolShoulderPoint() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLineP1Id(const quint32 &value); diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp index f7fa9d1b2..627b52d7b 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -62,10 +62,6 @@ VisToolTriangle::VisToolTriangle(const VContainer *data, QGraphicsItem *parent) point = InitPoint(mainColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolTriangle::~VisToolTriangle() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolTriangle::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/line/vistooltriangle.h b/src/libs/vtools/visualization/line/vistooltriangle.h index 2a2b632e2..a0f527231 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.h +++ b/src/libs/vtools/visualization/line/vistooltriangle.h @@ -46,8 +46,8 @@ class VisToolTriangle : public VisLine { Q_OBJECT public: - explicit VisToolTriangle(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolTriangle() Q_DECL_OVERRIDE; + explicit VisToolTriangle(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolTriangle() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.cpp b/src/libs/vtools/visualization/line/vistooltruedarts.cpp index e3379ab32..5cc603f0a 100644 --- a/src/libs/vtools/visualization/line/vistooltruedarts.cpp +++ b/src/libs/vtools/visualization/line/vistooltruedarts.cpp @@ -76,10 +76,6 @@ VisToolTrueDarts::VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent point2 = InitPoint(mainColor, this); //-V656 } -//--------------------------------------------------------------------------------------------------------------------- -VisToolTrueDarts::~VisToolTrueDarts() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolTrueDarts::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.h b/src/libs/vtools/visualization/line/vistooltruedarts.h index 13058d248..07c538f69 100644 --- a/src/libs/vtools/visualization/line/vistooltruedarts.h +++ b/src/libs/vtools/visualization/line/vistooltruedarts.h @@ -43,8 +43,8 @@ class VisToolTrueDarts :public VisLine { Q_OBJECT public: - explicit VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolTrueDarts() Q_DECL_OVERRIDE; + explicit VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolTrueDarts() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/visualization/path/vispath.cpp b/src/libs/vtools/visualization/path/vispath.cpp index 9fc28c8c4..2013dd022 100644 --- a/src/libs/vtools/visualization/path/vispath.cpp +++ b/src/libs/vtools/visualization/path/vispath.cpp @@ -44,10 +44,6 @@ VisPath::VisPath(const VContainer *data, QGraphicsItem *parent) InitPen(); } -//--------------------------------------------------------------------------------------------------------------------- -VisPath::~VisPath() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisPath::InitPen() { diff --git a/src/libs/vtools/visualization/path/vispath.h b/src/libs/vtools/visualization/path/vispath.h index 569e104a5..b653642ba 100644 --- a/src/libs/vtools/visualization/path/vispath.h +++ b/src/libs/vtools/visualization/path/vispath.h @@ -46,8 +46,8 @@ class VisPath : public Visualization, public QGraphicsPathItem { Q_OBJECT public: - explicit VisPath(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisPath() Q_DECL_OVERRIDE; + explicit VisPath(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisPath() Q_DECL_EQ_DEFAULT; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::Path)}; diff --git a/src/libs/vtools/visualization/path/vispiecepins.cpp b/src/libs/vtools/visualization/path/vispiecepins.cpp index 7c17fff7d..c1a05a812 100644 --- a/src/libs/vtools/visualization/path/vispiecepins.cpp +++ b/src/libs/vtools/visualization/path/vispiecepins.cpp @@ -38,11 +38,6 @@ VisPiecePins::VisPiecePins(const VContainer *data, QGraphicsItem *parent) { } -//--------------------------------------------------------------------------------------------------------------------- -VisPiecePins::~VisPiecePins() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VisPiecePins::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vispiecepins.h b/src/libs/vtools/visualization/path/vispiecepins.h index 6e874099d..67a8d964b 100644 --- a/src/libs/vtools/visualization/path/vispiecepins.h +++ b/src/libs/vtools/visualization/path/vispiecepins.h @@ -38,7 +38,7 @@ class VisPiecePins : public VisPath Q_OBJECT public: VisPiecePins(const VContainer *data, QGraphicsItem *parent = nullptr); - virtual ~VisPiecePins(); + virtual ~VisPiecePins() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void SetPins(const QVector &pins); diff --git a/src/libs/vtools/visualization/path/vistoolarc.cpp b/src/libs/vtools/visualization/path/vistoolarc.cpp index 1f53dfd94..ec53a9b41 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolarc.cpp @@ -49,10 +49,6 @@ VisToolArc::VisToolArc(const VContainer *data, QGraphicsItem *parent) arcCenter = InitPoint(mainColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolArc::~VisToolArc() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolArc::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h index 30155eb47..7b2702d27 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.h +++ b/src/libs/vtools/visualization/path/vistoolarc.h @@ -43,8 +43,8 @@ class VisToolArc : public VisPath { Q_OBJECT public: - explicit VisToolArc(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolArc() Q_DECL_OVERRIDE; + explicit VisToolArc(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolArc() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setRadius(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp index 52ce6cce3..54cb5b104 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp @@ -49,10 +49,6 @@ VisToolArcWithLength::VisToolArcWithLength(const VContainer *data, QGraphicsItem arcCenter = InitPoint(mainColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolArcWithLength::~VisToolArcWithLength() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolArcWithLength::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h index c455a533f..53cc179bf 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.h +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.h @@ -43,8 +43,8 @@ class VisToolArcWithLength : public VisPath { Q_OBJECT public: - explicit VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolArcWithLength() Q_DECL_OVERRIDE; + explicit VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolArcWithLength() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setRadius(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp index 10d297b85..de693b0a7 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp +++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.cpp @@ -66,11 +66,6 @@ VisToolCubicBezier::VisToolCubicBezier(const VContainer *data, QGraphicsItem *pa point4 = InitPoint(supportColor, this); //-V656 } -//--------------------------------------------------------------------------------------------------------------------- -VisToolCubicBezier::~VisToolCubicBezier() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void VisToolCubicBezier::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.h b/src/libs/vtools/visualization/path/vistoolcubicbezier.h index 97074b806..a59468db8 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezier.h +++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.h @@ -44,7 +44,7 @@ class VisToolCubicBezier : public VisPath Q_OBJECT public: explicit VisToolCubicBezier(const VContainer *data, QGraphicsItem *parent = nullptr); - virtual ~VisToolCubicBezier(); + virtual ~VisToolCubicBezier() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.cpp b/src/libs/vtools/visualization/path/vistoolcutarc.cpp index 14556e105..79a585525 100644 --- a/src/libs/vtools/visualization/path/vistoolcutarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutarc.cpp @@ -57,10 +57,6 @@ VisToolCutArc::VisToolCutArc(const VContainer *data, QGraphicsItem *parent) point->setFlag(QGraphicsItem::ItemStacksBehindParent, false); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolCutArc::~VisToolCutArc() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolCutArc::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.h b/src/libs/vtools/visualization/path/vistoolcutarc.h index df2ad6207..1ba8c6bbf 100644 --- a/src/libs/vtools/visualization/path/vistoolcutarc.h +++ b/src/libs/vtools/visualization/path/vistoolcutarc.h @@ -43,8 +43,8 @@ class VisToolCutArc : public VisPath { Q_OBJECT public: - explicit VisToolCutArc(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutArc() Q_DECL_OVERRIDE; + explicit VisToolCutArc(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolCutArc() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.cpp b/src/libs/vtools/visualization/path/vistoolcutspline.cpp index 1ae8f2ddb..19edb23a4 100644 --- a/src/libs/vtools/visualization/path/vistoolcutspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutspline.cpp @@ -59,10 +59,6 @@ VisToolCutSpline::VisToolCutSpline(const VContainer *data, QGraphicsItem *parent point->setFlag(QGraphicsItem::ItemStacksBehindParent, false); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolCutSpline::~VisToolCutSpline() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolCutSpline::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.h b/src/libs/vtools/visualization/path/vistoolcutspline.h index df002dd23..a5fb9ef37 100644 --- a/src/libs/vtools/visualization/path/vistoolcutspline.h +++ b/src/libs/vtools/visualization/path/vistoolcutspline.h @@ -43,8 +43,8 @@ class VisToolCutSpline : public VisPath { Q_OBJECT public: - explicit VisToolCutSpline(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutSpline() Q_DECL_OVERRIDE; + explicit VisToolCutSpline(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolCutSpline() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp index b449a3b06..c336f2501 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp @@ -59,10 +59,6 @@ VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem point->setFlag(QGraphicsItem::ItemStacksBehindParent, false); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolCutSplinePath::~VisToolCutSplinePath() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolCutSplinePath::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h index 18053c273..4accfa205 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h @@ -43,8 +43,8 @@ class VisToolCutSplinePath : public VisPath { Q_OBJECT public: - explicit VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutSplinePath() Q_DECL_OVERRIDE; + explicit VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolCutSplinePath() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp b/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp index 17acc8d6d..fda916c68 100644 --- a/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp @@ -46,10 +46,6 @@ VisToolEllipticalArc::VisToolEllipticalArc(const VContainer *data, QGraphicsItem arcCenter = InitPoint(mainColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolEllipticalArc::~VisToolEllipticalArc() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolEllipticalArc::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolellipticalarc.h b/src/libs/vtools/visualization/path/vistoolellipticalarc.h index 9a27b32c7..a3432213e 100644 --- a/src/libs/vtools/visualization/path/vistoolellipticalarc.h +++ b/src/libs/vtools/visualization/path/vistoolellipticalarc.h @@ -42,8 +42,8 @@ class VisToolEllipticalArc : public VisPath { Q_OBJECT public: - explicit VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolEllipticalArc() Q_DECL_OVERRIDE; + explicit VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolEllipticalArc() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setRadius1(const QString &expression); diff --git a/src/libs/vtools/visualization/path/vistoolpiece.cpp b/src/libs/vtools/visualization/path/vistoolpiece.cpp index 8895dacaa..38cdef19f 100644 --- a/src/libs/vtools/visualization/path/vistoolpiece.cpp +++ b/src/libs/vtools/visualization/path/vistoolpiece.cpp @@ -42,10 +42,6 @@ VisToolPiece::VisToolPiece(const VContainer *data, QGraphicsItem *parent) m_line2 = InitItem(supportColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolPiece::~VisToolPiece() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolPiece::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolpiece.h b/src/libs/vtools/visualization/path/vistoolpiece.h index a9071d5e4..5e35e2969 100644 --- a/src/libs/vtools/visualization/path/vistoolpiece.h +++ b/src/libs/vtools/visualization/path/vistoolpiece.h @@ -40,7 +40,7 @@ class VisToolPiece : public VisPath Q_OBJECT public: VisToolPiece(const VContainer *data, QGraphicsItem *parent = nullptr); - virtual ~VisToolPiece(); + virtual ~VisToolPiece() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void SetPiece(const VPiece &piece); diff --git a/src/libs/vtools/visualization/path/vistoolpiecepath.cpp b/src/libs/vtools/visualization/path/vistoolpiecepath.cpp index 46bc4ea55..403614584 100644 --- a/src/libs/vtools/visualization/path/vistoolpiecepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolpiecepath.cpp @@ -42,10 +42,6 @@ VisToolPiecePath::VisToolPiecePath(const VContainer *data, QGraphicsItem *parent m_line = InitItem(supportColor, this); } -//--------------------------------------------------------------------------------------------------------------------- -VisToolPiecePath::~VisToolPiecePath() -{} - //--------------------------------------------------------------------------------------------------------------------- void VisToolPiecePath::RefreshGeometry() { diff --git a/src/libs/vtools/visualization/path/vistoolpiecepath.h b/src/libs/vtools/visualization/path/vistoolpiecepath.h index 591561059..17113e0a9 100644 --- a/src/libs/vtools/visualization/path/vistoolpiecepath.h +++ b/src/libs/vtools/visualization/path/vistoolpiecepath.h @@ -42,7 +42,7 @@ class VisToolPiecePath : public VisPath Q_OBJECT public: VisToolPiecePath(const VContainer *data, QGraphicsItem *parent = nullptr); - virtual ~VisToolPiecePath(); + virtual ~VisToolPiecePath() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; void SetPath(const VPiecePath &piece); diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h index a3d691088..6a8174f52 100644 --- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h @@ -44,8 +44,8 @@ class VisToolPointOfIntersectionCurves : public VisPath { Q_OBJECT public: - explicit VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointOfIntersectionCurves() Q_DECL_OVERRIDE {} + explicit VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent = nullptr); + virtual ~VisToolPointOfIntersectionCurves() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry() Q_DECL_OVERRIDE; virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index dd2d8d2a2..60bd372d9 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -72,10 +72,6 @@ Visualization::Visualization(const VContainer *data) mode(Mode::Creation) {} -//--------------------------------------------------------------------------------------------------------------------- -Visualization::~Visualization() -{} - //--------------------------------------------------------------------------------------------------------------------- void Visualization::setObject1Id(const quint32 &value) { diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index e87319595..cdc7e8b2c 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -49,7 +49,7 @@ class Visualization : public QObject Q_OBJECT public: explicit Visualization(const VContainer *data); - virtual ~Visualization() Q_DECL_OVERRIDE; + virtual ~Visualization() Q_DECL_EQ_DEFAULT; virtual void RefreshGeometry()=0; diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.cpp b/src/libs/vwidgets/fancytabbar/fancytabbar.cpp index 99aac059d..f787c92f5 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.cpp +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.cpp @@ -70,11 +70,6 @@ FancyTabBar::FancyTabBar(const TabBarPosition position, QWidget *parent) connect(&m_timerTriggerChangedSignal, &QTimer::timeout, this, &FancyTabBar::EmitCurrentIndex); } -//--------------------------------------------------------------------------------------------------------------------- -FancyTabBar::~FancyTabBar() -{ -} - //--------------------------------------------------------------------------------------------------------------------- QSize FancyTabBar::TabSizeHint(bool minimum) const { diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.h b/src/libs/vwidgets/fancytabbar/fancytabbar.h index 311bc442e..f0f5cdd13 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.h +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.h @@ -53,7 +53,7 @@ public: }; FancyTabBar(const TabBarPosition position, QWidget *parent = nullptr); - virtual ~FancyTabBar(); + virtual ~FancyTabBar() Q_DECL_EQ_DEFAULT; virtual QSize sizeHint() const Q_DECL_OVERRIDE; virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; diff --git a/src/libs/vwidgets/vgrainlineitem.cpp b/src/libs/vwidgets/vgrainlineitem.cpp index c272a7445..98c3b07e9 100644 --- a/src/libs/vwidgets/vgrainlineitem.cpp +++ b/src/libs/vwidgets/vgrainlineitem.cpp @@ -77,13 +77,6 @@ VGrainlineItem::VGrainlineItem(QGraphicsItem* pParent) UpdateRectangle(); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief VGrainlineItem::~VGrainlineItem destructor - */ -VGrainlineItem::~VGrainlineItem() -{} - //--------------------------------------------------------------------------------------------------------------------- QPainterPath VGrainlineItem::shape() const { diff --git a/src/libs/vwidgets/vgrainlineitem.h b/src/libs/vwidgets/vgrainlineitem.h index 27ddbab53..8838f6319 100644 --- a/src/libs/vwidgets/vgrainlineitem.h +++ b/src/libs/vwidgets/vgrainlineitem.h @@ -37,7 +37,7 @@ class VGrainlineItem : public VPieceItem Q_OBJECT public: explicit VGrainlineItem(QGraphicsItem* pParent = nullptr); - virtual ~VGrainlineItem(); + virtual ~VGrainlineItem() Q_DECL_EQ_DEFAULT; virtual QPainterPath shape() const Q_DECL_OVERRIDE; diff --git a/src/libs/vwidgets/vtextgraphicsitem.cpp b/src/libs/vwidgets/vtextgraphicsitem.cpp index 014282088..adb284ee0 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.cpp +++ b/src/libs/vwidgets/vtextgraphicsitem.cpp @@ -130,13 +130,6 @@ VTextGraphicsItem::VTextGraphicsItem(QGraphicsItem* pParent) setZValue(m_inactiveZ); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief VTextGraphicsItem::~VTextGraphicsItem destructor - */ -VTextGraphicsItem::~VTextGraphicsItem() -{} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief VTextGraphicsItem::SetFont sets the item font diff --git a/src/libs/vwidgets/vtextgraphicsitem.h b/src/libs/vwidgets/vtextgraphicsitem.h index c453d520f..e1e8e62a7 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.h +++ b/src/libs/vwidgets/vtextgraphicsitem.h @@ -53,7 +53,7 @@ class VTextGraphicsItem : public VPieceItem Q_OBJECT public: explicit VTextGraphicsItem(QGraphicsItem* pParent = nullptr); - virtual ~VTextGraphicsItem(); + virtual ~VTextGraphicsItem() Q_DECL_EQ_DEFAULT; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; virtual void Update() Q_DECL_OVERRIDE; diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 79560e280..31ef8998d 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -42,11 +42,6 @@ TST_BuitInRegExp::TST_BuitInRegExp(const QString &locale, QObject *parent) { } -//--------------------------------------------------------------------------------------------------------------------- -TST_BuitInRegExp::~TST_BuitInRegExp() -{ -} - //--------------------------------------------------------------------------------------------------------------------- void TST_BuitInRegExp::initTestCase() { diff --git a/src/test/TranslationsTest/tst_buitinregexp.h b/src/test/TranslationsTest/tst_buitinregexp.h index 4e3c52a63..7626d0001 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 public: explicit TST_BuitInRegExp(const QString &locale, QObject *parent = nullptr); - virtual ~TST_BuitInRegExp(); + virtual ~TST_BuitInRegExp() Q_DECL_EQ_DEFAULT; protected: virtual void PrepareData() Q_DECL_OVERRIDE; diff --git a/src/test/ValentinaTest/qttestmainlambda.cpp b/src/test/ValentinaTest/qttestmainlambda.cpp index ce182637b..697d684ca 100644 --- a/src/test/ValentinaTest/qttestmainlambda.cpp +++ b/src/test/ValentinaTest/qttestmainlambda.cpp @@ -59,7 +59,7 @@ class TestVApplication : public VAbstractApplication public: TestVApplication(int &argc, char ** argv); - virtual ~TestVApplication(); + virtual ~TestVApplication() Q_DECL_EQ_DEFAULT; virtual const VTranslateVars *TrVars(); virtual void OpenSettings(); @@ -73,11 +73,6 @@ TestVApplication::TestVApplication(int &argc, char **argv) { } -//--------------------------------------------------------------------------------------------------------------------- -TestVApplication::~TestVApplication() -{ -} - //--------------------------------------------------------------------------------------------------------------------- const VTranslateVars *TestVApplication::TrVars() {