Refactoring. Use "=default" instead of the default implementation.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-04-01 17:27:55 +03:00
parent 9433a6b358
commit e2383eb500
109 changed files with 74 additions and 310 deletions

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -39,7 +39,3 @@ VExceptionUndo::VExceptionUndo(const QString &what)
VExceptionUndo::VExceptionUndo(const VExceptionUndo &e)
:VException(e)
{}
//---------------------------------------------------------------------------------------------------------------------
VExceptionUndo::~VExceptionUndo() V_NOEXCEPT_EXPR (true)
{}

View File

@ -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

View File

@ -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;

View File

@ -58,10 +58,6 @@ VAbstractConverter::VAbstractConverter(const QString &fileName)
m_ver = GetVersion(GetVersionStr());
}
//---------------------------------------------------------------------------------------------------------------------
VAbstractConverter::~VAbstractConverter()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VAbstractConverter::Convert()
{

View File

@ -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();

View File

@ -41,11 +41,6 @@ VAbstractMConverter::VAbstractMConverter(const QString &fileName)
{
}
//---------------------------------------------------------------------------------------------------------------------
VAbstractMConverter::~VAbstractMConverter()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractMConverter::AddRootComment()
{

View File

@ -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();

View File

@ -205,10 +205,6 @@ VAbstractPattern::VAbstractPattern(QObject *parent)
modified(false)
{}
//---------------------------------------------------------------------------------------------------------------------
VAbstractPattern::~VAbstractPattern()
{}
//---------------------------------------------------------------------------------------------------------------------
QStringList VAbstractPattern::ListMeasurements() const
{

View File

@ -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;

View File

@ -136,10 +136,6 @@ VDomDocument::VDomDocument()
map()
{}
//---------------------------------------------------------------------------------------------------------------------
VDomDocument::~VDomDocument()
{}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief Finds an element by id.

View File

@ -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);

View File

@ -143,10 +143,6 @@ VPatternConverter::VPatternConverter(const QString &fileName)
ValidateInputFile(CurrentSchema);
}
//---------------------------------------------------------------------------------------------------------------------
VPatternConverter::~VPatternConverter()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VPatternConverter::XSDSchema(int ver) const
{

View File

@ -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;

View File

@ -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()
{}

View File

@ -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;

View File

@ -69,10 +69,6 @@ VVITConverter::VVITConverter(const QString &fileName)
ValidateInputFile(CurrentSchema);
}
//---------------------------------------------------------------------------------------------------------------------
VVITConverter::~VVITConverter()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VVITConverter::XSDSchema(int ver) const
{

View File

@ -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;

View File

@ -69,10 +69,6 @@ VVSTConverter::VVSTConverter(const QString &fileName)
ValidateInputFile(CurrentSchema);
}
//---------------------------------------------------------------------------------------------------------------------
VVSTConverter::~VVSTConverter()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VVSTConverter::XSDSchema(int ver) const
{

View File

@ -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;

View File

@ -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)
{

View File

@ -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;

View File

@ -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

View File

@ -57,7 +57,7 @@ public:
m_penStyle(path.m_penStyle)
{}
~VLayoutPiecePathData();
~VLayoutPiecePathData() Q_DECL_EQ_DEFAULT;
/** @brief m_points list of path points. */
QVector<QPointF> m_points;
@ -69,9 +69,6 @@ private:
VLayoutPiecePathData &operator=(const VLayoutPiecePathData &) Q_DECL_EQ_DELETE;
};
VLayoutPiecePathData::~VLayoutPiecePathData()
{}
QT_WARNING_POP
#endif // VLAYOUTPIECEPATH_P_H

View File

@ -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<QStringList> 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
*/

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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<quint32> &source, const QVector<DestinationItem> &destination,

View File

@ -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<quint32> &source, const QVector<DestinationItem> &destination,

View File

@ -66,11 +66,6 @@ template <class T> class QSharedPointer;
const QString VToolFlippingByAxis::ToolType = QStringLiteral("flippingByAxis");
//---------------------------------------------------------------------------------------------------------------------
VToolFlippingByAxis::~VToolFlippingByAxis()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VToolFlippingByAxis::setDialog()
{

View File

@ -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);

View File

@ -66,11 +66,6 @@ template <class T> class QSharedPointer;
const QString VToolFlippingByLine::ToolType = QStringLiteral("flippingByLine");
//---------------------------------------------------------------------------------------------------------------------
VToolFlippingByLine::~VToolFlippingByLine()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VToolFlippingByLine::setDialog()
{

View File

@ -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);

View File

@ -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
{

View File

@ -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;

View File

@ -74,11 +74,6 @@ template <class T> class QSharedPointer;
const QString VToolMove::ToolType = QStringLiteral("moving");
//---------------------------------------------------------------------------------------------------------------------
VToolMove::~VToolMove()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VToolMove::setDialog()
{

View File

@ -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);

View File

@ -92,10 +92,6 @@ VToolRotation::VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id
ToolCreation(typeCreation);
}
//---------------------------------------------------------------------------------------------------------------------
VToolRotation::~VToolRotation()
{}
//---------------------------------------------------------------------------------------------------------------------
void VToolRotation::setDialog()
{

View File

@ -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);

View File

@ -62,10 +62,6 @@ VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint3
setAcceptHoverEvents(true);
}
//---------------------------------------------------------------------------------------------------------------------
VAbstractSpline::~VAbstractSpline()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VAbstractSpline::getTagName() const
{

View File

@ -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<int>(Tool::AbstractSpline)};

View File

@ -70,11 +70,6 @@ VToolCubicBezier::VToolCubicBezier(VAbstractPattern *doc, VContainer *data, quin
ToolCreation(typeCreation);
}
//---------------------------------------------------------------------------------------------------------------------
VToolCubicBezier::~VToolCubicBezier()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VToolCubicBezier::setDialog()
{

View File

@ -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);

View File

@ -72,11 +72,6 @@ VToolCubicBezierPath::VToolCubicBezierPath(VAbstractPattern *doc, VContainer *da
ToolCreation(typeCreation);
}
//---------------------------------------------------------------------------------------------------------------------
VToolCubicBezierPath::~VToolCubicBezierPath()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VToolCubicBezierPath::setDialog()
{

View File

@ -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);

View File

@ -78,10 +78,6 @@ VToolDoublePoint::VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quin
secondPoint->RefreshGeometry(*VAbstractTool::data.GeometricObject<VPointF>(p2id));
}
//---------------------------------------------------------------------------------------------------------------------
VToolDoublePoint::~VToolDoublePoint()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VToolDoublePoint::nameP1() const
{

View File

@ -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<int>(Tool::DoublePoint)};

View File

@ -81,10 +81,6 @@ VToolCurveIntersectAxis::VToolCurveIntersectAxis(VAbstractPattern *doc, VContain
ToolCreation(typeCreation);
}
//---------------------------------------------------------------------------------------------------------------------
VToolCurveIntersectAxis::~VToolCurveIntersectAxis()
{}
//---------------------------------------------------------------------------------------------------------------------
void VToolCurveIntersectAxis::setDialog()
{

View File

@ -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,

View File

@ -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.

View File

@ -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);

View File

@ -67,10 +67,6 @@ VToolLineIntersectAxis::VToolLineIntersectAxis(VAbstractPattern *doc, VContainer
ToolCreation(typeCreation);
}
//---------------------------------------------------------------------------------------------------------------------
VToolLineIntersectAxis::~VToolLineIntersectAxis()
{}
//---------------------------------------------------------------------------------------------------------------------
void VToolLineIntersectAxis::setDialog()
{

View File

@ -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,

View File

@ -92,10 +92,6 @@ VToolSinglePoint::VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quin
RefreshPointGeometry(*VAbstractTool::data.GeometricObject<VPointF>(id));
}
//---------------------------------------------------------------------------------------------------------------------
VToolSinglePoint::~VToolSinglePoint()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VToolSinglePoint::name() const
{

View File

@ -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<int>(Tool::SinglePoint)};

View File

@ -40,10 +40,6 @@ VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32
:VDrawTool(doc, data, id)
{}
//---------------------------------------------------------------------------------------------------------------------
VAbstractPoint::~VAbstractPoint()
{}
//---------------------------------------------------------------------------------------------------------------------
QString VAbstractPoint::getTagName() const
{

View File

@ -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;

View File

@ -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;

View File

@ -44,10 +44,6 @@ VDataTool::VDataTool(VContainer *data, QObject *parent)
SCASSERT(data != nullptr)
}
//---------------------------------------------------------------------------------------------------------------------
VDataTool::~VDataTool()
{}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief decrementReferens decrement referens.

View File

@ -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;

View File

@ -59,10 +59,6 @@ VisToolShoulderPoint::VisToolShoulderPoint(const VContainer *data, QGraphicsItem
point = InitPoint(mainColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolShoulderPoint::~VisToolShoulderPoint()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolShoulderPoint::RefreshGeometry()
{

View File

@ -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);

View File

@ -62,10 +62,6 @@ VisToolTriangle::VisToolTriangle(const VContainer *data, QGraphicsItem *parent)
point = InitPoint(mainColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolTriangle::~VisToolTriangle()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolTriangle::RefreshGeometry()
{

View File

@ -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;

View File

@ -76,10 +76,6 @@ VisToolTrueDarts::VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent
point2 = InitPoint(mainColor, this); //-V656
}
//---------------------------------------------------------------------------------------------------------------------
VisToolTrueDarts::~VisToolTrueDarts()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolTrueDarts::RefreshGeometry()
{

View File

@ -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;

View File

@ -44,10 +44,6 @@ VisPath::VisPath(const VContainer *data, QGraphicsItem *parent)
InitPen();
}
//---------------------------------------------------------------------------------------------------------------------
VisPath::~VisPath()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisPath::InitPen()
{

View File

@ -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<int>(Vis::Path)};

View File

@ -38,11 +38,6 @@ VisPiecePins::VisPiecePins(const VContainer *data, QGraphicsItem *parent)
{
}
//---------------------------------------------------------------------------------------------------------------------
VisPiecePins::~VisPiecePins()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VisPiecePins::RefreshGeometry()
{

View File

@ -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<quint32> &pins);

View File

@ -49,10 +49,6 @@ VisToolArc::VisToolArc(const VContainer *data, QGraphicsItem *parent)
arcCenter = InitPoint(mainColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolArc::~VisToolArc()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolArc::RefreshGeometry()
{

View File

@ -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);

View File

@ -49,10 +49,6 @@ VisToolArcWithLength::VisToolArcWithLength(const VContainer *data, QGraphicsItem
arcCenter = InitPoint(mainColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolArcWithLength::~VisToolArcWithLength()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolArcWithLength::RefreshGeometry()
{

View File

@ -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);

View File

@ -66,11 +66,6 @@ VisToolCubicBezier::VisToolCubicBezier(const VContainer *data, QGraphicsItem *pa
point4 = InitPoint(supportColor, this); //-V656
}
//---------------------------------------------------------------------------------------------------------------------
VisToolCubicBezier::~VisToolCubicBezier()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VisToolCubicBezier::RefreshGeometry()
{

View File

@ -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;

View File

@ -57,10 +57,6 @@ VisToolCutArc::VisToolCutArc(const VContainer *data, QGraphicsItem *parent)
point->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolCutArc::~VisToolCutArc()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolCutArc::RefreshGeometry()
{

View File

@ -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);

View File

@ -59,10 +59,6 @@ VisToolCutSpline::VisToolCutSpline(const VContainer *data, QGraphicsItem *parent
point->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolCutSpline::~VisToolCutSpline()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolCutSpline::RefreshGeometry()
{

View File

@ -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);

View File

@ -59,10 +59,6 @@ VisToolCutSplinePath::VisToolCutSplinePath(const VContainer *data, QGraphicsItem
point->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolCutSplinePath::~VisToolCutSplinePath()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolCutSplinePath::RefreshGeometry()
{

View File

@ -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);

View File

@ -46,10 +46,6 @@ VisToolEllipticalArc::VisToolEllipticalArc(const VContainer *data, QGraphicsItem
arcCenter = InitPoint(mainColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolEllipticalArc::~VisToolEllipticalArc()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolEllipticalArc::RefreshGeometry()
{

View File

@ -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);

View File

@ -42,10 +42,6 @@ VisToolPiece::VisToolPiece(const VContainer *data, QGraphicsItem *parent)
m_line2 = InitItem<QGraphicsLineItem>(supportColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolPiece::~VisToolPiece()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolPiece::RefreshGeometry()
{

View File

@ -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);

View File

@ -42,10 +42,6 @@ VisToolPiecePath::VisToolPiecePath(const VContainer *data, QGraphicsItem *parent
m_line = InitItem<QGraphicsLineItem>(supportColor, this);
}
//---------------------------------------------------------------------------------------------------------------------
VisToolPiecePath::~VisToolPiecePath()
{}
//---------------------------------------------------------------------------------------------------------------------
void VisToolPiecePath::RefreshGeometry()
{

View File

@ -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);

View File

@ -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;

View File

@ -72,10 +72,6 @@ Visualization::Visualization(const VContainer *data)
mode(Mode::Creation)
{}
//---------------------------------------------------------------------------------------------------------------------
Visualization::~Visualization()
{}
//---------------------------------------------------------------------------------------------------------------------
void Visualization::setObject1Id(const quint32 &value)
{

View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More