From ac49d298f8173e365ceea110de661ffbc4ef5c63 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 16 May 2016 20:59:04 +0300 Subject: [PATCH] Refactoring. Use tag names from class VAbstractPattern. --HG-- branch : feature --- src/app/valentina/xml/vpattern.cpp | 5 ++--- src/libs/ifc/xml/vabstractpattern.cpp | 1 + src/libs/ifc/xml/vabstractpattern.h | 1 + .../vtools/tools/drawTools/toolcurve/vabstractspline.cpp | 4 +--- src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h | 3 +-- src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp | 3 +-- src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h | 2 +- .../vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp | 3 +-- .../vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h | 2 +- .../drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp | 2 +- .../vtools/tools/drawTools/toolpoint/vabstractpoint.cpp | 4 +--- src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h | 1 - src/libs/vtools/tools/drawTools/vtoolline.cpp | 6 ++---- src/libs/vtools/tools/drawTools/vtoolline.h | 1 - src/libs/vtools/tools/nodeDetails/vnodearc.cpp | 5 ++--- src/libs/vtools/tools/nodeDetails/vnodearc.h | 2 +- src/libs/vtools/tools/nodeDetails/vnodepoint.cpp | 5 ++--- src/libs/vtools/tools/nodeDetails/vnodepoint.h | 2 +- src/libs/vtools/tools/nodeDetails/vnodespline.cpp | 5 ++--- src/libs/vtools/tools/nodeDetails/vnodespline.h | 2 +- src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp | 5 ++--- src/libs/vtools/tools/nodeDetails/vnodesplinepath.h | 2 +- src/libs/vtools/tools/vtooldetail.cpp | 6 ++---- src/libs/vtools/tools/vtooldetail.h | 1 - src/libs/vtools/tools/vtooluniondetails.cpp | 5 ++--- src/libs/vtools/tools/vtooluniondetails.h | 2 +- 26 files changed, 31 insertions(+), 49 deletions(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 23e55eb8d..a34d332b5 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -305,8 +305,7 @@ quint32 VPattern::SPointActiveDraw() const QDomElement domElement = domNode.toElement(); if (domElement.isNull() == false) { - if (domElement.tagName() == VToolSinglePoint::TagName && - domElement.attribute(AttrType, "") == VToolBasePoint::ToolType) + if (domElement.tagName() == TagPoint && domElement.attribute(AttrType, "") == VToolBasePoint::ToolType) { return GetParametrId(domElement); } @@ -658,7 +657,7 @@ void VPattern::ParseDetails(const QDomElement &domElement, const Document &parse const QDomElement domElement = domNode.toElement(); if (domElement.isNull() == false) { - if (domElement.tagName() == VToolDetail::TagName) + if (domElement.tagName() == TagDetail) { ParseDetailElement(domElement, parse); } diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 4b495c1e4..c0c6ea1f1 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -38,6 +38,7 @@ const QString VAbstractPattern::TagPattern = QStringLiteral("pattern"); const QString VAbstractPattern::TagCalculation = QStringLiteral("calculation"); const QString VAbstractPattern::TagModeling = QStringLiteral("modeling"); const QString VAbstractPattern::TagDetails = QStringLiteral("details"); +const QString VAbstractPattern::TagDetail = QStringLiteral("detail"); const QString VAbstractPattern::TagAuthor = QStringLiteral("author"); const QString VAbstractPattern::TagDescription = QStringLiteral("description"); const QString VAbstractPattern::TagNotes = QStringLiteral("notes"); diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 8bc3444fc..8847ec6ab 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -132,6 +132,7 @@ public: static const QString TagCalculation; static const QString TagModeling; static const QString TagDetails; + static const QString TagDetail; static const QString TagAuthor; static const QString TagDescription; static const QString TagImage; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 48b1ca526..1339e5dec 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -32,8 +32,6 @@ #include -const QString VAbstractSpline::TagName = QStringLiteral("spline"); - //--------------------------------------------------------------------------------------------------------------------- VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsPathItem(parent), controlPoints(QVector()), @@ -49,7 +47,7 @@ VAbstractSpline::~VAbstractSpline() //--------------------------------------------------------------------------------------------------------------------- QString VAbstractSpline::getTagName() const { - return VAbstractSpline::TagName; + return VAbstractPattern::TagSpline; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 89f2548f2..656e65b50 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -42,8 +42,7 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem public: VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); virtual ~VAbstractSpline() Q_DECL_OVERRIDE; - // cppcheck-suppress duplInheritedMember - static const QString TagName; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::AbstractSpline)}; virtual QString getTagName() const Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index c35e0f0f4..9ae207749 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -36,7 +36,6 @@ #include -const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); //--------------------------------------------------------------------------------------------------------------------- @@ -165,7 +164,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra //--------------------------------------------------------------------------------------------------------------------- QString VToolArc::getTagName() const { - return VToolArc::TagName; + return VAbstractPattern::TagArc; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h index 8f03a4cb6..ac513f7c7 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h @@ -45,7 +45,7 @@ public: static VToolArc* Create(const quint32 _id, const quint32 ¢er, QString &radius, QString &f1, QString &f2, const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); - static const QString TagName; + static const QString ToolType; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Arc)}; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 7b5ff3e6f..f872705a3 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -36,7 +36,6 @@ #include -const QString VToolArcWithLength::TagName = QStringLiteral("arc"); const QString VToolArcWithLength::ToolType = QStringLiteral("arcWithLength"); //--------------------------------------------------------------------------------------------------------------------- @@ -134,7 +133,7 @@ VToolArcWithLength *VToolArcWithLength::Create(const quint32 _id, const quint32 //--------------------------------------------------------------------------------------------------------------------- QString VToolArcWithLength::getTagName() const { - return VToolArcWithLength::TagName; + return VAbstractPattern::TagArc; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h index 0a8f89847..13387a86c 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h @@ -44,7 +44,7 @@ public: QString &length, const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); - static const QString TagName; + static const QString ToolType; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::ArcWithLength)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index 93781042f..238703690 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -125,7 +125,7 @@ void VToolBasePoint::AddToFile() { Q_ASSERT_X(not namePP.isEmpty(), Q_FUNC_INFO, "name pattern piece is empty"); - QDomElement sPoint = doc->createElement(TagName); + QDomElement sPoint = doc->createElement(getTagName()); // Create SPoint tag QSharedPointer obj = VAbstractTool::data.GetGObject(id); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index e7027800e..9d2e751fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -29,8 +29,6 @@ #include "vabstractpoint.h" #include "../vgeometry/vpointf.h" -const QString VAbstractPoint::TagName = QStringLiteral("point"); - //--------------------------------------------------------------------------------------------------------------------- VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id) :VDrawTool(doc, data, id) @@ -43,7 +41,7 @@ VAbstractPoint::~VAbstractPoint() //--------------------------------------------------------------------------------------------------------------------- QString VAbstractPoint::getTagName() const { - return VAbstractPoint::TagName; + return VAbstractPattern::TagPoint; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index c6ae7623e..ecb7e5c64 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -40,7 +40,6 @@ public: virtual ~VAbstractPoint() Q_DECL_OVERRIDE; virtual QString getTagName() const Q_DECL_OVERRIDE; - static const QString TagName; template void ShowToolVisualization(bool show); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 3b57cbb68..7b3604f8a 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -33,8 +33,6 @@ #include "../../dialogs/tools/dialogline.h" #include "../../visualization/line/vistoolline.h" -const QString VToolLine::TagName = QStringLiteral("line"); - //--------------------------------------------------------------------------------------------------------------------- /** * @brief VToolLine constructor. @@ -167,7 +165,7 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con //--------------------------------------------------------------------------------------------------------------------- QString VToolLine::getTagName() const { - return VToolLine::TagName; + return VAbstractPattern::TagLine; } //--------------------------------------------------------------------------------------------------------------------- @@ -249,7 +247,7 @@ void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolLine::AddToFile() { - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); QSharedPointer obj = QSharedPointer (); SaveOptions(domElement, obj); AddToCalculation(domElement); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h index 99dea64d4..0e06e9777 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.h +++ b/src/libs/vtools/tools/drawTools/vtoolline.h @@ -45,7 +45,6 @@ public: const QString &typeLine, const QString &lineColor, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); - static const QString TagName; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Line)}; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index a0f53931a..06922cbdc 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -31,7 +31,6 @@ #include #include -const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); //--------------------------------------------------------------------------------------------------------------------- @@ -94,7 +93,7 @@ void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint //--------------------------------------------------------------------------------------------------------------------- QString VNodeArc::getTagName() const { - return VNodeArc::TagName; + return VAbstractPattern::TagArc; } //--------------------------------------------------------------------------------------------------------------------- @@ -117,7 +116,7 @@ void VNodeArc::AllowSelecting(bool enabled) */ void VNodeArc::AddToFile() { - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrType, ToolType); diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h index 5f5b82f9a..fc6597b68 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h @@ -41,7 +41,7 @@ class VNodeArc :public VAbstractNode public: static void Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document &parse, const Source &typeCreation, const quint32 &idTool = 0); - static const QString TagName; + static const QString ToolType; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index e06ecd7e2..c3942b581 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -33,7 +33,6 @@ #include #include -const QString VNodePoint::TagName = QStringLiteral("point"); const QString VNodePoint::ToolType = QStringLiteral("modeling"); //--------------------------------------------------------------------------------------------------------------------- @@ -119,7 +118,7 @@ void VNodePoint::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsSc //--------------------------------------------------------------------------------------------------------------------- QString VNodePoint::getTagName() const { - return VNodePoint::TagName; + return VAbstractPattern::TagPoint; } //--------------------------------------------------------------------------------------------------------------------- @@ -195,7 +194,7 @@ void VNodePoint::FullUpdateFromFile() void VNodePoint::AddToFile() { const QSharedPointer point = VAbstractTool::data.GeometricObject(id); - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrType, ToolType); diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h index 0cb79c618..f2074f7b7 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h @@ -47,7 +47,7 @@ public: static void Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, quint32 idPoint, const Document &parse, const Source &typeCreation, const quint32 &idTool = 0); - static const QString TagName; + static const QString ToolType; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::NodePoint)}; diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp index 2690e01df..5555bf0ba 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp @@ -31,7 +31,6 @@ #include #include -const QString VNodeSpline::TagName = QStringLiteral("spline"); const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); //--------------------------------------------------------------------------------------------------------------------- @@ -98,7 +97,7 @@ VNodeSpline *VNodeSpline::Create(VAbstractPattern *doc, VContainer *data, quint3 //--------------------------------------------------------------------------------------------------------------------- QString VNodeSpline::getTagName() const { - return VNodeSpline::TagName; + return VAbstractPattern::TagSpline; } //--------------------------------------------------------------------------------------------------------------------- @@ -121,7 +120,7 @@ void VNodeSpline::AllowSelecting(bool enabled) */ void VNodeSpline::AddToFile() { - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrType, ToolType); diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h index 1e77447f0..08823b0d9 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.h +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h @@ -42,7 +42,7 @@ public: static VNodeSpline *Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, const Source &typeCreation, const quint32 &idTool = 0); - static const QString TagName; + static const QString ToolType; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index 91a7f7e4d..4c16ce503 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -32,7 +32,6 @@ #include #include -const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); //--------------------------------------------------------------------------------------------------------------------- @@ -95,7 +94,7 @@ void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, quint32 id //--------------------------------------------------------------------------------------------------------------------- QString VNodeSplinePath::getTagName() const { - return VNodeSplinePath::TagName; + return VAbstractPattern::TagSpline; } //--------------------------------------------------------------------------------------------------------------------- @@ -118,7 +117,7 @@ void VNodeSplinePath::AllowSelecting(bool enabled) */ void VNodeSplinePath::AddToFile() { - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrType, ToolType); diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h index acb11f213..2976cc53b 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h @@ -42,7 +42,7 @@ public: static void Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, const Source &typeCreation, const quint32 &idTool = 0); - static const QString TagName; + static const QString ToolType; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index b94a046c2..8938d0904 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -47,8 +47,6 @@ #include #include - -const QString VToolDetail::TagName = QStringLiteral("detail"); const QString VToolDetail::TagNode = QStringLiteral("node"); const QString VToolDetail::AttrSupplement = QStringLiteral("supplement"); @@ -315,7 +313,7 @@ void VToolDetail::FullUpdateFromGuiOk(int result) void VToolDetail::AddToFile() { VDetail detail = VAbstractTool::data.GetDetail(id); - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrName, detail.getName()); @@ -619,7 +617,7 @@ void VToolDetail::AddNode(VAbstractPattern *doc, QDomElement &domElement, const //--------------------------------------------------------------------------------------------------------------------- QString VToolDetail::getTagName() const { - return VToolDetail::TagName; + return VAbstractPattern::TagDetail; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/vtooldetail.h b/src/libs/vtools/tools/vtooldetail.h index 18bdccc05..0d989c0a5 100644 --- a/src/libs/vtools/tools/vtooldetail.h +++ b/src/libs/vtools/tools/vtooldetail.h @@ -64,7 +64,6 @@ public: static void Create(const quint32 &_id, const VDetail &newDetail, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation, const QString &drawName = QString()); - static const QString TagName; static const QString TagNode; static const QString AttrSupplement; static const QString AttrClosed; diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 8e06df24c..2b1840e90 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -36,7 +36,6 @@ #include -const QString VToolUnionDetails::TagName = QStringLiteral("tools"); const QString VToolUnionDetails::ToolType = QStringLiteral("unionDetails"); const QString VToolUnionDetails::TagDetail = QStringLiteral("det"); const QString VToolUnionDetails::TagNode = QStringLiteral("node"); @@ -439,7 +438,7 @@ void VToolUnionDetails::BiasRotatePoint(VPointF *point, const qreal &dx, const q //--------------------------------------------------------------------------------------------------------------------- QString VToolUnionDetails::getTagName() const { - return VToolUnionDetails::TagName; + return VAbstractPattern::TagTools; } //--------------------------------------------------------------------------------------------------------------------- @@ -778,7 +777,7 @@ QVector VToolUnionDetails::GetDetailFromFile(VAbstractPattern *doc, con */ void VToolUnionDetails::AddToFile() { - QDomElement domElement = doc->createElement(TagName); + QDomElement domElement = doc->createElement(getTagName()); doc->SetAttribute(domElement, VDomDocument::AttrId, id); doc->SetAttribute(domElement, AttrType, ToolType); diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h index 63a7c3698..4ba45ab19 100644 --- a/src/libs/vtools/tools/vtooluniondetails.h +++ b/src/libs/vtools/tools/vtooluniondetails.h @@ -56,7 +56,7 @@ public: static void PointsOnEdge(const VDetail &d, const quint32 &index, VPointF &p1, VPointF &p2, VContainer *data); static void FindIndexJ(const qint32 &pointsD2, const VDetail &d2, const quint32 &indexD2, qint32 &j); static QVector GetDetailFromFile(VAbstractPattern *doc, const QDomElement &domElement); - static const QString TagName; + static const QString ToolType; static const QString TagDetail; static const QString TagNode;