Refactoring.
This commit is contained in:
parent
a13f13e3fc
commit
b9a2a6715b
|
@ -46,7 +46,7 @@ public:
|
|||
explicit VFormulaPropertyEditor(QWidget *parent);
|
||||
|
||||
//! Destructor
|
||||
~VFormulaPropertyEditor() override Q_DECL_EQ_DEFAULT;
|
||||
~VFormulaPropertyEditor() override = default;
|
||||
|
||||
//! Returns the formula currently set
|
||||
auto GetFormula() const -> VFormula;
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
explicit VException(const QString &error) V_NOEXCEPT_EXPR (true);
|
||||
VException(const VException &e) V_NOEXCEPT_EXPR (true);
|
||||
VException &operator=(const VException &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VException() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override;
|
||||
|
||||
|
@ -103,7 +103,7 @@ public:
|
|||
explicit VExceptionToolWasDeleted(const QString &error) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionToolWasDeleted(const VExceptionToolWasDeleted &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionToolWasDeleted &operator=(const VExceptionToolWasDeleted &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override;
|
||||
// cppcheck-suppress unusedFunction
|
||||
|
|
|
@ -46,7 +46,7 @@ public:
|
|||
VExceptionBadId(const QString &error, const QString &key) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionBadId(const VExceptionBadId &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionBadId &operator=(const VExceptionBadId &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ public:
|
|||
VExceptionConversionError(const QString &error, const QString &str) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionConversionError(const VExceptionConversionError &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionConversionError &operator=(const VExceptionConversionError &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ public:
|
|||
const QDomElement &domElement) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionEmptyParameter(const VExceptionEmptyParameter &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionEmptyParameter &operator=(const VExceptionEmptyParameter &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ public:
|
|||
explicit VExceptionInvalidHistory(const QString &error) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionInvalidHistory(const VExceptionInvalidHistory &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionInvalidHistory &operator=(const VExceptionInvalidHistory &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionInvalidHistory() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionInvalidHistory() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ public:
|
|||
explicit VExceptionInvalidNotch(const QString &error) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionInvalidNotch(const VExceptionInvalidNotch &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionInvalidNotch &operator=(const VExceptionInvalidNotch &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionInvalidNotch() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionInvalidNotch() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ public:
|
|||
explicit VExceptionObjectError(const QString &what) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionObjectError(const VExceptionObjectError &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionObjectError &operator=(const VExceptionObjectError &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ class VExceptionUndo : public VException
|
|||
public:
|
||||
explicit VExceptionUndo(const QString &what) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionUndo(const VExceptionUndo &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ public:
|
|||
VExceptionWrongId(const QString &what, const QDomElement &domElement) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionWrongId(const VExceptionWrongId &e) V_NOEXCEPT_EXPR (true);
|
||||
VExceptionWrongId &operator=(const VExceptionWrongId &e) V_NOEXCEPT_EXPR (true);
|
||||
virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) = default;
|
||||
|
||||
Q_NORETURN virtual void raise() const override { throw *this; }
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ class VAbstractConverter :public VDomDocument
|
|||
{
|
||||
public:
|
||||
explicit VAbstractConverter(const QString &fileName);
|
||||
virtual ~VAbstractConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractConverter() = default;
|
||||
|
||||
QString Convert();
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ class VAbstractMConverter : public VAbstractConverter
|
|||
{
|
||||
public:
|
||||
explicit VAbstractMConverter(const QString &fileName);
|
||||
virtual ~VAbstractMConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractMConverter() = default;
|
||||
|
||||
auto Units() const -> Unit;
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ class VLabelTemplateConverter : public VAbstractConverter
|
|||
{
|
||||
public:
|
||||
explicit VLabelTemplateConverter(const QString &fileName);
|
||||
virtual ~VLabelTemplateConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VLabelTemplateConverter() = default;
|
||||
|
||||
static const QString LabelTemplateMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
|
|
|
@ -48,7 +48,7 @@ class VPatternConverter final : public VAbstractConverter
|
|||
Q_DECLARE_TR_FUNCTIONS(VPatternConverter) // NOLINT
|
||||
public:
|
||||
explicit VPatternConverter(const QString &fileName);
|
||||
virtual ~VPatternConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VPatternConverter() = default;
|
||||
|
||||
static const QString PatternMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
|
|
|
@ -45,7 +45,7 @@ public:
|
|||
bool operator==(const VToolRecord &record) const;
|
||||
VToolRecord &operator=(const VToolRecord &record);
|
||||
VToolRecord(const VToolRecord &record);
|
||||
~VToolRecord() Q_DECL_EQ_DEFAULT;
|
||||
~VToolRecord() = default;
|
||||
|
||||
quint32 getId() const;
|
||||
void setId(const quint32 &value);
|
||||
|
|
|
@ -44,7 +44,7 @@ class VVITConverter final : public VAbstractMConverter
|
|||
Q_DECLARE_TR_FUNCTIONS(VVITConverter) // NOLINT
|
||||
public:
|
||||
explicit VVITConverter(const QString &fileName);
|
||||
virtual ~VVITConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VVITConverter() = default;
|
||||
|
||||
static const QString MeasurementMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
|
|
|
@ -44,7 +44,7 @@ class VVSTConverter final : public VAbstractMConverter
|
|||
Q_DECLARE_TR_FUNCTIONS(VVSTConverter) // NOLINT
|
||||
public:
|
||||
explicit VVSTConverter(const QString &fileName);
|
||||
virtual ~VVSTConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VVSTConverter() = default;
|
||||
|
||||
static const QString MeasurementMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
|
|
|
@ -34,7 +34,7 @@ class VWatermarkConverter final : public VAbstractConverter
|
|||
{
|
||||
public:
|
||||
explicit VWatermarkConverter(const QString &fileName);
|
||||
virtual ~VWatermarkConverter() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VWatermarkConverter() = default;
|
||||
|
||||
static const QString WatermarkMaxVerStr;
|
||||
static const QString CurrentSchema;
|
||||
|
|
|
@ -35,7 +35,7 @@ class VLabelTemplate : public VDomDocument
|
|||
{
|
||||
public:
|
||||
VLabelTemplate();
|
||||
virtual ~VLabelTemplate() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VLabelTemplate() = default;
|
||||
|
||||
static const QString TagTemplate;
|
||||
static const QString TagLines;
|
||||
|
|
|
@ -54,7 +54,7 @@ public:
|
|||
VMeasurements(Unit unit, VContainer *data);
|
||||
VMeasurements(Unit unit, const QVector<MeasurementDimension_p > &dimensions,
|
||||
VContainer *data);
|
||||
virtual ~VMeasurements() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VMeasurements() = default;
|
||||
|
||||
virtual void setXMLContent(const QString &fileName) override;
|
||||
virtual bool SaveDocument(const QString &fileName, QString &error) override;
|
||||
|
|
|
@ -44,7 +44,7 @@ class VPatternRecipe : public VDomDocument
|
|||
Q_DECLARE_TR_FUNCTIONS(VPatternRecipe) // NOLINT
|
||||
public:
|
||||
explicit VPatternRecipe(VAbstractPattern *pattern, QObject *parent = nullptr);
|
||||
virtual ~VPatternRecipe() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VPatternRecipe() = default;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY_MOVE(VPatternRecipe) // NOLINT
|
||||
|
|
|
@ -36,7 +36,7 @@ class VWatermark : public VDomDocument
|
|||
Q_DECLARE_TR_FUNCTIONS(VWatermark) // NOLINT
|
||||
public:
|
||||
VWatermark();
|
||||
virtual ~VWatermark() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VWatermark() = default;
|
||||
|
||||
void CreateEmptyWatermark();
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ public:
|
|||
m_uuid(piece.m_uuid)
|
||||
{}
|
||||
|
||||
~VAbstractPieceData() Q_DECL_EQ_DEFAULT;
|
||||
~VAbstractPieceData() = default;
|
||||
|
||||
friend QDataStream& operator<<(QDataStream& dataStream, const VAbstractPieceData& piece);
|
||||
friend QDataStream& operator>>(QDataStream& dataStream, VAbstractPieceData& piece);
|
||||
|
|
|
@ -85,7 +85,7 @@ public:
|
|||
m_yScale(detail.m_yScale)
|
||||
{}
|
||||
|
||||
~VLayoutPieceData() Q_DECL_EQ_DEFAULT;
|
||||
~VLayoutPieceData() = default;
|
||||
|
||||
friend QDataStream& operator<<(QDataStream& dataStream, const VLayoutPieceData& piece);
|
||||
friend QDataStream& operator>>(QDataStream& dataStream, VLayoutPieceData& piece);
|
||||
|
|
|
@ -63,7 +63,7 @@ public:
|
|||
m_cut(path.m_cut)
|
||||
{}
|
||||
|
||||
~VLayoutPiecePathData() Q_DECL_EQ_DEFAULT;
|
||||
~VLayoutPiecePathData() = default;
|
||||
|
||||
friend QDataStream& operator<<(QDataStream& dataStream, const VLayoutPiecePathData& path);
|
||||
friend QDataStream& operator>>(QDataStream& dataStream, VLayoutPiecePathData& path);
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
QxtCsvModelPrivate() : csvData(), header(), maxColumn(0), quoteMode(QxtCsvModel::DefaultQuoteMode)
|
||||
{}
|
||||
QXT_DECLARE_PUBLIC(QxtCsvModel)
|
||||
virtual ~QxtCsvModelPrivate() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~QxtCsvModelPrivate() = default;
|
||||
|
||||
QList<QStringList> csvData;
|
||||
QStringList header;
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
QTextCodec *codec = nullptr);
|
||||
explicit QxtCsvModel(const QString &filename, QObject *parent = nullptr, bool withHeader = false,
|
||||
QChar separator = ',', QTextCodec *codec = nullptr);
|
||||
virtual ~QxtCsvModel() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~QxtCsvModel() = default;
|
||||
|
||||
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
TestVApplication::OpenSettings();
|
||||
}
|
||||
|
||||
virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~TestVApplication() = default;
|
||||
|
||||
virtual const VTranslateVars *TrVars() override
|
||||
{
|
||||
|
|
|
@ -61,7 +61,7 @@ class Calculator final : public qmu::QmuFormulaBase
|
|||
{
|
||||
public:
|
||||
Calculator();
|
||||
virtual ~Calculator() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~Calculator() = default;
|
||||
|
||||
qreal EvalFormula(const QHash<QString, QSharedPointer<VInternalVariable> > *vars, const QString &formula);
|
||||
protected:
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
m_bVisible(data.m_bVisible)
|
||||
{}
|
||||
|
||||
~VAbstractFloatItemDataPrivate() Q_DECL_EQ_DEFAULT;
|
||||
~VAbstractFloatItemDataPrivate() = default;
|
||||
|
||||
/** @brief m_ptPos position of label's top left corner */
|
||||
QPointF m_ptPos;
|
||||
|
|
|
@ -65,7 +65,7 @@ public:
|
|||
m_bottomPin(data.m_bottomPin)
|
||||
{}
|
||||
|
||||
~VGrainlineDataPrivate() Q_DECL_EQ_DEFAULT;
|
||||
~VGrainlineDataPrivate() = default;
|
||||
|
||||
/** @brief m_dLength formula to calculate the length of grainline */
|
||||
QString m_qsLength;
|
||||
|
|
|
@ -67,7 +67,7 @@ public:
|
|||
m_bottomRightPin(data.m_bottomRightPin)
|
||||
{}
|
||||
|
||||
~VPatternLabelDataPrivate() Q_DECL_EQ_DEFAULT;
|
||||
~VPatternLabelDataPrivate() = default;
|
||||
|
||||
/** @brief m_dLabelWidth formula to calculate the width of label */
|
||||
QString m_dLabelWidth;
|
||||
|
|
|
@ -68,7 +68,7 @@ public:
|
|||
m_lines(data.m_lines)
|
||||
{}
|
||||
|
||||
~VPieceLabelDataPrivate() Q_DECL_EQ_DEFAULT;
|
||||
~VPieceLabelDataPrivate() = default;
|
||||
|
||||
/** @brief m_qsLetter Detail letter (should be no more than 3 characters) */
|
||||
QString m_qsLetter;
|
||||
|
|
|
@ -82,7 +82,7 @@ public:
|
|||
m_manualPassmarkLength(node.m_manualPassmarkLength)
|
||||
{}
|
||||
|
||||
~VPieceNodeData() Q_DECL_EQ_DEFAULT;
|
||||
~VPieceNodeData() = default;
|
||||
|
||||
friend QDataStream& operator<<(QDataStream& out, const VPieceNodeData& p);
|
||||
friend QDataStream& operator>>(QDataStream& in, VPieceNodeData& p);
|
||||
|
|
|
@ -37,7 +37,7 @@ class VAbstractFlipping : public VAbstractOperation
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VAbstractFlipping() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractFlipping() = default;
|
||||
protected:
|
||||
explicit VAbstractFlipping(const VAbstractOperationInitData &initData, QGraphicsItem *parent = nullptr);
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ class VToolFlippingByAxis : public VAbstractFlipping
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolFlippingByAxis() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolFlippingByAxis() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolFlippingByAxis* Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
VAbstractPattern *doc, VContainer *data);
|
||||
|
|
|
@ -50,7 +50,7 @@ class VToolFlippingByLine : public VAbstractFlipping
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolFlippingByLine() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolFlippingByLine() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolFlippingByLine* Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
VAbstractPattern *doc, VContainer *data);
|
||||
|
|
|
@ -75,7 +75,7 @@ class VAbstractOperation : public VDrawTool, public QGraphicsLineItem
|
|||
// in Q_INTERFACES. qobject_cast to QGraphicsItem will not work!"
|
||||
Q_INTERFACES(QGraphicsItem)
|
||||
public:
|
||||
virtual ~VAbstractOperation() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractOperation() = default;
|
||||
|
||||
static const QString TagItem;
|
||||
static const QString TagSource;
|
||||
|
|
|
@ -65,7 +65,7 @@ class VToolMove : public VAbstractOperation
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolMove() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolMove() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolMove* Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
|
||||
VContainer *data);
|
||||
|
|
|
@ -61,7 +61,7 @@ class VToolRotation : public VAbstractOperation
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolRotation() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolRotation() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolRotation* Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
|
||||
VContainer *data);
|
||||
|
|
|
@ -75,7 +75,7 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem
|
|||
public:
|
||||
VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es,
|
||||
QGraphicsItem * parent = nullptr);
|
||||
virtual ~VAbstractSpline() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractSpline() = default;
|
||||
|
||||
virtual QPainterPath shape() const override;
|
||||
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
|
|
|
@ -62,7 +62,7 @@ class VToolCubicBezier : public VAbstractSpline
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolCubicBezier() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolCubicBezier() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolCubicBezier *Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
VAbstractPattern *doc, VContainer *data);
|
||||
|
|
|
@ -62,7 +62,7 @@ class VToolCubicBezierPath:public VAbstractSpline
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolCubicBezierPath() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolCubicBezierPath() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolCubicBezierPath *Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
VAbstractPattern *doc, VContainer *data);
|
||||
|
|
|
@ -50,7 +50,7 @@ class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem
|
|||
public:
|
||||
VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id,
|
||||
const QString ¬es, QGraphicsItem * parent = nullptr);
|
||||
virtual ~VToolDoublePoint() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolDoublePoint() = default;
|
||||
|
||||
virtual int type() const override {return Type;}
|
||||
enum { Type = UserType + static_cast<int>(Tool::DoublePoint)};
|
||||
|
|
|
@ -60,7 +60,7 @@ class VToolCurveIntersectAxis : public VToolLinePoint
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolCurveIntersectAxis() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolCurveIntersectAxis() = default;
|
||||
virtual void setDialog() override;
|
||||
|
||||
static VToolCurveIntersectAxis *Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
|
|
|
@ -65,7 +65,7 @@ class VToolEndLine : public VToolLinePoint
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolEndLine() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolEndLine() = default;
|
||||
virtual void setDialog() override;
|
||||
static VToolEndLine *Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
|
||||
VContainer *data);
|
||||
|
|
|
@ -66,7 +66,7 @@ class VToolLineIntersectAxis : public VToolLinePoint
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolLineIntersectAxis() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolLineIntersectAxis() = default;
|
||||
virtual void setDialog() override;
|
||||
|
||||
static VToolLineIntersectAxis *Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
|
|
|
@ -69,7 +69,7 @@ class VToolSinglePoint: public VAbstractPoint, public VScenePoint
|
|||
public:
|
||||
VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es,
|
||||
QGraphicsItem * parent = nullptr);
|
||||
virtual ~VToolSinglePoint() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolSinglePoint() = default;
|
||||
|
||||
virtual int type() const override {return Type;}
|
||||
enum { Type = UserType + static_cast<int>(Tool::SinglePoint)};
|
||||
|
|
|
@ -54,7 +54,7 @@ class VAbstractPoint: public VDrawTool
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es);
|
||||
virtual ~VAbstractPoint() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractPoint() = default;
|
||||
|
||||
virtual QString getTagName() const override;
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ class VDrawTool : public VInteractiveTool
|
|||
public:
|
||||
|
||||
VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QObject *parent = nullptr);
|
||||
virtual ~VDrawTool() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VDrawTool() = default;
|
||||
|
||||
QString getLineType() const;
|
||||
virtual void SetLineType(const QString &value);
|
||||
|
|
|
@ -64,7 +64,7 @@ class VAbstractNode : public VAbstractTool
|
|||
public:
|
||||
VAbstractNode(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &idNode,
|
||||
const QString &drawName = QString(), const quint32 &idTool = 0, QObject *parent = nullptr);
|
||||
virtual ~VAbstractNode() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractNode() = default;
|
||||
static const QString AttrIdTool;
|
||||
virtual void ShowVisualization(bool show) override;
|
||||
virtual void incrementReferens() override;
|
||||
|
|
|
@ -49,7 +49,7 @@ class VDataTool : public QObject
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
explicit VDataTool(VContainer *data, QObject *parent = nullptr);
|
||||
virtual ~VDataTool() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VDataTool() = default;
|
||||
VContainer getData() const;
|
||||
void setData(const VContainer *value);
|
||||
virtual quint32 referens() const;
|
||||
|
|
|
@ -39,7 +39,7 @@ class VInteractiveTool : public VAbstractTool
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
VInteractiveTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr);
|
||||
virtual ~VInteractiveTool() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VInteractiveTool() = default;
|
||||
|
||||
void DialogLinkDestroy();
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ class VToolSeamAllowance : public VInteractiveTool, public QGraphicsPathItem
|
|||
{
|
||||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
virtual ~VToolSeamAllowance() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VToolSeamAllowance() = default;
|
||||
|
||||
static VToolSeamAllowance* Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,
|
||||
VAbstractPattern *doc, VContainer *data);
|
||||
|
|
|
@ -53,7 +53,7 @@ public:
|
|||
};
|
||||
|
||||
explicit FancyTabBar(const TabBarPosition position, QWidget *parent = nullptr);
|
||||
virtual ~FancyTabBar() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~FancyTabBar() = default;
|
||||
|
||||
virtual QSize sizeHint() const override;
|
||||
virtual QSize minimumSizeHint() const override;
|
||||
|
|
|
@ -51,7 +51,7 @@ class VAbstractMainWindow : public QMainWindow
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
explicit VAbstractMainWindow(QWidget *parent = nullptr);
|
||||
virtual ~VAbstractMainWindow() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VAbstractMainWindow() = default;
|
||||
|
||||
public slots:
|
||||
virtual void ShowToolTip(const QString &toolTip);
|
||||
|
|
|
@ -38,7 +38,7 @@ class VGrainlineItem final : public VPieceItem
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
explicit VGrainlineItem(QGraphicsItem* pParent = nullptr);
|
||||
virtual ~VGrainlineItem() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VGrainlineItem() = default;
|
||||
|
||||
virtual QPainterPath shape() const override;
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ class VSimpleCurve : public VAbstractSimple, public VCurvePathItem
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
VSimpleCurve(quint32 id, const QSharedPointer<VAbstractCurve> &curve, QObject *parent = nullptr);
|
||||
virtual ~VSimpleCurve() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VSimpleCurve() = default;
|
||||
|
||||
virtual int type() const override {return Type;}
|
||||
enum { Type = UserType + static_cast<int>(Vis::SimpleCurve)};
|
||||
|
|
|
@ -53,7 +53,7 @@ class VTextGraphicsItem final : public VPieceItem
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
explicit VTextGraphicsItem(QGraphicsItem* pParent = nullptr);
|
||||
virtual ~VTextGraphicsItem() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~VTextGraphicsItem() = default;
|
||||
|
||||
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
virtual void Update() override;
|
||||
|
|
|
@ -41,7 +41,7 @@ class TST_BuitInRegExp : public TST_AbstractRegExp
|
|||
Q_OBJECT // NOLINT
|
||||
public:
|
||||
explicit TST_BuitInRegExp(const QString &locale, QObject *parent = nullptr);
|
||||
virtual ~TST_BuitInRegExp() Q_DECL_EQ_DEFAULT;
|
||||
virtual ~TST_BuitInRegExp() = default;
|
||||
|
||||
protected:
|
||||
virtual void PrepareData() override;
|
||||
|
|
Loading…
Reference in New Issue
Block a user