Refactoring. Each a static method has access to each method in a class. So, we

can declare a constructor in private section for each a tool class that has
"Create" methods.

--HG--
branch : feature

src/libs/vtools/tools/drawTools/operation/vtoolrotation.h

@@ -45,10 +45,6 @@ class VToolRotation : public VDrawTool, public QGraphicsItem
 {
     Q_OBJECT
 public:
-    VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 origPointId,
-                  const QString &angle, const QString &suffix, const QVector<quint32> &source,
-                  const QVector<DestinationItem> &destination, const Source &typeCreation,
-                  QGraphicsItem *parent = nullptr);
     virtual ~VToolRotation();
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolRotation* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
@@ -125,6 +121,11 @@ private:
 
     QMap<quint32, VAbstractSimple *> rObjects;
 
+    VToolRotation(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 origPointId,
+                  const QString &angle, const QString &suffix, const QVector<quint32> &source,
+                  const QVector<DestinationItem> &destination, const Source &typeCreation,
+                  QGraphicsItem *parent = nullptr);
+
     void UpdateNamePosition(quint32 id);
 
     static DestinationItem CreatePoint(quint32 idTool, quint32 idItem, const QPointF &origin, qreal angle,

src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h

@@ -40,8 +40,6 @@ class VToolArc :public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolArc(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation,
-             QGraphicsItem * parent = nullptr);
     virtual void     setDialog() Q_DECL_OVERRIDE;
     static VToolArc* Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc, VContainer *data);
     static VToolArc* Create(const quint32 _id, const quint32 &center, QString &radius, QString &f1, QString &f2,
@@ -73,6 +71,11 @@ protected:
     virtual void     SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj) Q_DECL_OVERRIDE;
     virtual void     SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolArc)
+
+    VToolArc(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation,
+             QGraphicsItem * parent = nullptr);
+
     virtual void RefreshGeometry() Q_DECL_OVERRIDE;
 };
 

src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h

@@ -37,10 +37,6 @@ class VToolArcWithLength : public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolArcWithLength(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
-                       const Source &typeCreation,
-                       QGraphicsItem * parent = nullptr);
-
     virtual void     setDialog() Q_DECL_OVERRIDE;
     static VToolArcWithLength* Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                       VContainer *data);
@@ -74,6 +70,11 @@ protected:
     virtual void     SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj) Q_DECL_OVERRIDE;
     virtual void     SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolArcWithLength)
+
+    VToolArcWithLength(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
+                       const Source &typeCreation, QGraphicsItem * parent = nullptr);
+
     virtual void RefreshGeometry() Q_DECL_OVERRIDE;
 
 };

src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h

@@ -37,8 +37,6 @@ class VToolCubicBezier : public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolCubicBezier(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
-                     const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual ~VToolCubicBezier();
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolCubicBezier *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
@@ -63,6 +61,9 @@ protected:
 private:
     Q_DISABLE_COPY(VToolCubicBezier)
 
+    VToolCubicBezier(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
+                     const Source &typeCreation, QGraphicsItem * parent = nullptr);
+
     virtual void RefreshGeometry() Q_DECL_OVERRIDE;
     void SetSplineAttributes(QDomElement &domElement, const VCubicBezier &spl);
 };

src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h

@@ -37,8 +37,6 @@ class VToolCubicBezierPath:public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolCubicBezierPath(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
-                         const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual ~VToolCubicBezierPath();
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolCubicBezierPath *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
@@ -65,6 +63,9 @@ protected:
 private:
     Q_DISABLE_COPY(VToolCubicBezierPath)
 
+    VToolCubicBezierPath(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
+                         const Source &typeCreation, QGraphicsItem * parent = nullptr);
+
     virtual void  RefreshGeometry() Q_DECL_OVERRIDE;
     static void   AddPathPoint(VAbstractPattern *doc, QDomElement &domElement, const VPointF &splPoint);
     void          SetSplinePathAttributes(QDomElement &domElement, const VCubicBezierPath &path);

src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h

@@ -40,8 +40,6 @@ class VToolSpline:public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolSpline (VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation,
-                 QGraphicsItem * parent = nullptr );
     virtual ~VToolSpline() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolSpline *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data);
@@ -80,6 +78,9 @@ private:
     Q_DISABLE_COPY(VToolSpline)
     QPointF oldPosition;
 
+    VToolSpline (VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation,
+                 QGraphicsItem * parent = nullptr );
+
     bool IsMovable() const;
     virtual void RefreshGeometry() Q_DECL_OVERRIDE;
     void SetSplineAttributes(QDomElement &domElement, const VSpline &spl);

src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h

@@ -42,9 +42,6 @@ class VToolSplinePath:public VAbstractSpline
 {
     Q_OBJECT
 public:
-    VToolSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
-                    const Source &typeCreation,
-                    QGraphicsItem * parent = nullptr);
     virtual ~VToolSplinePath() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolSplinePath *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
@@ -104,6 +101,9 @@ private:
     QPointF oldPosition;
     int     splIndex;
 
+    VToolSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color,
+                    const Source &typeCreation, QGraphicsItem * parent = nullptr);
+
     bool          IsMovable(int index) const;
     virtual void  RefreshGeometry() Q_DECL_OVERRIDE;
     static void   AddPathPoint(VAbstractPattern *doc, QDomElement &domElement, const VSplinePoint &splPoint);

src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h

@@ -35,19 +35,6 @@ class VToolTrueDarts : public VToolDoublePoint
 {
     Q_OBJECT
 public:
-    VToolTrueDarts(VAbstractPattern *doc,
-                   VContainer *data,
-                   const quint32 &id,
-                   const quint32 &p1id,
-                   const quint32 &p2id,
-                   const quint32 &baseLineP1Id,
-                   const quint32 &baseLineP2Id,
-                   const quint32 &dartP1Id,
-                   const quint32 &dartP2Id,
-                   const quint32 &dartP3Id,
-                   const Source &typeCreation,
-                   QGraphicsItem * parent = nullptr);
-
     static void    FindPoint(const QPointF &baseLineP1, const QPointF &baseLineP2, const QPointF &dartP1,
                              const QPointF &dartP2, const QPointF &dartP3, QPointF &p1, QPointF &p2);
     virtual void   setDialog() Q_DECL_OVERRIDE;
@@ -100,6 +87,19 @@ private:
     quint32 dartP1Id;
     quint32 dartP2Id;
     quint32 dartP3Id;
+
+    VToolTrueDarts(VAbstractPattern *doc,
+                   VContainer *data,
+                   const quint32 &id,
+                   const quint32 &p1id,
+                   const quint32 &p2id,
+                   const quint32 &baseLineP1Id,
+                   const quint32 &baseLineP2Id,
+                   const quint32 &dartP1Id,
+                   const quint32 &dartP2Id,
+                   const quint32 &dartP3Id,
+                   const Source &typeCreation,
+                   QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLTRUEDARTS_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h

@@ -38,9 +38,6 @@ class VToolCutArc : public VToolCut
 {
     Q_OBJECT
 public:
-    VToolCutArc(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
-                const quint32 &arcId, const QString &color, const Source &typeCreation,
-                QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolCutArc*  Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data);
     static VToolCutArc*  Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId,
@@ -59,6 +56,10 @@ protected:
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VToolCutArc)
+
+    VToolCutArc(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
+                const quint32 &arcId, const QString &color, const Source &typeCreation,
+                QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLCUTARC_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h

@@ -38,10 +38,6 @@ class VToolCutSpline : public VToolCut
 {
     Q_OBJECT
 public:
-
-    VToolCutSpline(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
-                   const quint32 &splineId, const QString &color, const Source &typeCreation,
-                   QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolCutSpline *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                   VContainer *data);
@@ -63,6 +59,10 @@ protected:
     virtual void  SetVisualization() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VToolCutSpline)
+
+    VToolCutSpline(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
+                   const quint32 &splineId, const QString &color, const Source &typeCreation,
+                   QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLCUTSPLINE_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h

@@ -42,10 +42,6 @@ class VToolCutSplinePath : public VToolCut
 {
     Q_OBJECT
 public:
-
-    VToolCutSplinePath(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
-                       const quint32 &splinePathId, const QString &color, const Source &typeCreation,
-                       QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolCutSplinePath *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                       VContainer *data);
@@ -71,6 +67,10 @@ protected:
     virtual void  SetVisualization() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VToolCutSplinePath)
+
+    VToolCutSplinePath(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
+                       const quint32 &splinePathId, const QString &color, const Source &typeCreation,
+                       QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLCUTSPLINEPATH_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h

@@ -38,11 +38,6 @@ class VToolAlongLine : public VToolLinePoint
 {
     Q_OBJECT
 public:
-
-    VToolAlongLine(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &formula,
-                   const quint32 &firstPointId,
-                   const quint32 &secondPointId, const QString &typeLine, const QString &lineColor,
-                   const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolAlongLine* Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                   VContainer *data);
@@ -69,8 +64,15 @@ protected:
     virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolAlongLine)
+
     /** @brief secondPointId id second point of line. */
     quint32       secondPointId;
+
+    VToolAlongLine(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &formula,
+                   const quint32 &firstPointId,
+                   const quint32 &secondPointId, const QString &typeLine, const QString &lineColor,
+                   const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLALONGLINE_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h

@@ -38,11 +38,6 @@ class VToolBisector : public VToolLinePoint
 {
     Q_OBJECT
 public:
-
-    VToolBisector(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                  const QString &lineColor,
-                  const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId,
-                  const quint32 &thirdPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr);
     static qreal   BisectorAngle(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint);
     static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint,
                              const qreal& length);
@@ -76,11 +71,18 @@ protected:
     virtual void   ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void   SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolBisector)
+
     /** @brief firstPointId id first point of angle. */
     quint32         firstPointId;
 
     /** @brief thirdPointId id third point of angle. */
     quint32         thirdPointId;
+
+    VToolBisector(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                  const QString &lineColor,
+                  const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId,
+                  const quint32 &thirdPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLBISECTOR_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h

@@ -35,9 +35,6 @@ class VToolCurveIntersectAxis : public VToolLinePoint
 {
     Q_OBJECT
 public:
-    VToolCurveIntersectAxis(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                            const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId,
-                            const quint32 &curveId, const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual ~VToolCurveIntersectAxis() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
 
@@ -73,6 +70,10 @@ private:
     QString formulaAngle;
     quint32 curveId;
 
+    VToolCurveIntersectAxis(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                            const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId,
+                            const quint32 &curveId, const Source &typeCreation, QGraphicsItem * parent = nullptr);
+
     static void InitSegments(const GOType &curveType, qreal segLength, const VPointF *p, quint32 curveId,
                              VContainer *data);
 };

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h

@@ -38,11 +38,6 @@ class VToolEndLine : public VToolLinePoint
 {
     Q_OBJECT
 public:
-
-    VToolEndLine(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                 const QString &lineColor,
-                 const QString &formulaLength, const QString &formulaAngle, const quint32 &basePointId,
-                 const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual ~VToolEndLine() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolEndLine *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
@@ -67,7 +62,14 @@ protected:
     virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolEndLine)
+
     QString formulaAngle;
+
+    VToolEndLine(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                 const QString &lineColor,
+                 const QString &formulaLength, const QString &formulaAngle, const quint32 &basePointId,
+                 const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLENDLINE_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h

@@ -38,11 +38,6 @@ class VToolHeight: public VToolLinePoint
 {
     Q_OBJECT
 public:
-
-    VToolHeight(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                const QString &lineColor,
-                const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId,
-                const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void   setDialog() Q_DECL_OVERRIDE;
     static VToolHeight *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc, VContainer *data);
     static VToolHeight *Create(const quint32 _id, const QString &pointName, const QString &typeLine,
@@ -69,11 +64,18 @@ protected:
     virtual void   ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void   SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolHeight)
+
     /** @brief p1LineId id first point of line. */
     quint32         p1LineId;
 
     /** @brief p2LineId id second point of line. */
     quint32         p2LineId;
+
+    VToolHeight(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                const QString &lineColor,
+                const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId,
+                const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLHEIGHT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h

@@ -35,10 +35,6 @@ class VToolLineIntersectAxis : public VToolLinePoint
 {
     Q_OBJECT
 public:
-    VToolLineIntersectAxis(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                           const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId,
-                           const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation,
-                           QGraphicsItem * parent = nullptr);
     virtual ~VToolLineIntersectAxis() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
 
@@ -75,9 +71,15 @@ protected:
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VToolLineIntersectAxis)
+
     QString formulaAngle;
     quint32 firstPointId;
     quint32 secondPointId;
+
+    VToolLineIntersectAxis(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                           const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId,
+                           const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation,
+                           QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLLINEINTERSECTAXIS_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h

@@ -38,10 +38,6 @@ class VToolNormal : public VToolLinePoint
 {
     Q_OBJECT
 public:
-    VToolNormal(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                const QString &lineColor,
-                const QString &formula, const qreal &angle, const quint32 &firstPointId, const quint32 &secondPointId,
-                const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void   setDialog() Q_DECL_OVERRIDE;
     static VToolNormal* Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc, VContainer *data);
     static VToolNormal* Create(const quint32 _id, QString &formula, const quint32 &firstPointId,
@@ -70,8 +66,15 @@ protected:
     virtual void   ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void   SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolNormal)
+
     /** @brief secondPointId id second line point. */
     quint32        secondPointId;
+
+    VToolNormal(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                const QString &lineColor,
+                const QString &formula, const qreal &angle, const quint32 &firstPointId, const quint32 &secondPointId,
+                const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLNORMAL_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h

@@ -39,9 +39,6 @@ class VToolShoulderPoint : public VToolLinePoint
 {
     Q_OBJECT
 public:
-    VToolShoulderPoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
-                       const QString &lineColor, const QString &formula, const quint32 &p1Line, const quint32 &p2Line,
-                       const quint32 &pShoulder, const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void   setDialog() Q_DECL_OVERRIDE;
     static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder,
                              const qreal &length);
@@ -74,11 +71,17 @@ protected:
     virtual void   ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void   SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolShoulderPoint)
+
     /** @brief p2Line id second line point. */
     quint32         p2Line;
 
     /** @brief pShoulder id shoulder line point. */
     quint32         pShoulder;
+
+    VToolShoulderPoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine,
+                       const QString &lineColor, const QString &formula, const quint32 &p1Line, const quint32 &p2Line,
+                       const quint32 &pShoulder, const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLSHOULDERPOINT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h

@@ -39,8 +39,6 @@ class VToolBasePoint : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolBasePoint (VAbstractPattern *doc, VContainer *data, quint32 id, const Source &typeCreation,
-                      const QString &namePP, QGraphicsItem * parent = nullptr );
     virtual ~VToolBasePoint() Q_DECL_OVERRIDE;
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolBasePoint *Create(quint32 _id, const QString &nameActivPP, VPointF *point,
@@ -74,9 +72,14 @@ protected:
     virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void SetVisualization() Q_DECL_OVERRIDE {}
 private:
-    QString namePP;
+    Q_DISABLE_COPY(VToolBasePoint)
-    void         SetColorLabel(const Qt::GlobalColor & color);
 
+    QString namePP;
+
+    VToolBasePoint (VAbstractPattern *doc, VContainer *data, quint32 id, const Source &typeCreation,
+                      const QString &namePP, QGraphicsItem * parent = nullptr );
+
+    void         SetColorLabel(const Qt::GlobalColor & color);
 };
 
 #endif // VTOOLBASEPOINT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h

@@ -38,9 +38,6 @@ class VToolLineIntersect:public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolLineIntersect(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &p1Line1,
-                       const quint32 &p2Line1, const quint32 &p1Line2, const quint32 &p2Line2,
-                       const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolLineIntersect *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc,
                                       VContainer *data);
@@ -76,6 +73,8 @@ protected:
     virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolLineIntersect)
+
     /** @brief p1Line1 id first point first line. */
     quint32       p1Line1;
 
@@ -87,6 +86,10 @@ private:
 
     /** @brief p2Line2 id second point second line.*/
     quint32       p2Line2;
+
+    VToolLineIntersect(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &p1Line1,
+                       const quint32 &p2Line1, const quint32 &p1Line2, const quint32 &p2Line2,
+                       const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLLINEINTERSECT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h

@@ -35,9 +35,6 @@ class VToolPointFromArcAndTangent : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolPointFromArcAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 arcId,
-                                quint32 tangentPointId, CrossCirclesPoint crossPoint, const Source &typeCreation,
-                                QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointFromArcAndTangent *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                                VContainer *data);
@@ -73,6 +70,10 @@ private:
     quint32 arcId;
     quint32 tangentPointId;
     CrossCirclesPoint crossPoint;
+
+    VToolPointFromArcAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 arcId,
+                                quint32 tangentPointId, CrossCirclesPoint crossPoint, const Source &typeCreation,
+                                QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTFROMARCANDTANGENT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h

@@ -37,9 +37,6 @@ class VToolPointFromCircleAndTangent : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolPointFromCircleAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 circleCenterId,
-                                   const QString &circleRadius, quint32 tangentPointId, CrossCirclesPoint crossPoint,
-                                   const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointFromCircleAndTangent *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                                   VContainer *data);
@@ -80,6 +77,10 @@ private:
     quint32 tangentPointId;
     QString circleRadius;
     CrossCirclesPoint crossPoint;
+
+    VToolPointFromCircleAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 circleCenterId,
+                                   const QString &circleRadius, quint32 tangentPointId, CrossCirclesPoint crossPoint,
+                                   const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTFROMCIRCLEANDTANGENT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h

@@ -40,9 +40,6 @@ class VToolPointOfContact : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolPointOfContact(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &arcRadius,
-                        const quint32 &center, const quint32 &firstPointId, const quint32 &secondPointId,
-                        const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void   setDialog() Q_DECL_OVERRIDE;
     static QPointF FindPoint(const qreal &arcRadius, const QPointF &center, const QPointF &firstPoint,
                              const QPointF &secondPoint);
@@ -81,6 +78,8 @@ protected:
     virtual void   ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void   SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolPointOfContact)
+
     /** @brief radius string with formula radius arc. */
     QString        arcRadius;
 
@@ -92,6 +91,10 @@ private:
 
     /** @brief secondPointId id second line point. */
     quint32        secondPointId;
+
+    VToolPointOfContact(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &arcRadius,
+                        const quint32 &center, const quint32 &firstPointId, const quint32 &secondPointId,
+                        const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTOFCONTACT_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h

@@ -38,9 +38,6 @@ class VToolPointOfIntersection : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolPointOfIntersection(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstPointId,
-                             const quint32 &secondPointId, const Source &typeCreation,
-                             QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointOfIntersection *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                             VContainer *data);
@@ -68,11 +65,16 @@ protected:
     virtual void SetVisualization() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VToolPointOfIntersection)
+
     /** @brief firstPointId id first line point. */
     quint32       firstPointId;
 
     /** @brief secondPointId id second line point. */
     quint32       secondPointId;
+
+    VToolPointOfIntersection(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstPointId,
+                             const quint32 &secondPointId, const Source &typeCreation,
+                             QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTOFINTERSECTION_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h

@@ -38,9 +38,6 @@ class VToolPointOfIntersectionArcs : public VToolSinglePoint
     Q_OBJECT
 
 public:
-    VToolPointOfIntersectionArcs(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstArcId,
-                                 const quint32 &secondArcId, CrossCirclesPoint crossPoint, const Source &typeCreation,
-                                 QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointOfIntersectionArcs *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                                 VContainer *data);
@@ -81,6 +78,10 @@ private:
     quint32       secondArcId;
 
     CrossCirclesPoint crossPoint;
+
+    VToolPointOfIntersectionArcs(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstArcId,
+                                 const quint32 &secondArcId, CrossCirclesPoint crossPoint, const Source &typeCreation,
+                                 QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTOFINTERSECTIONARCS_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h

@@ -37,11 +37,6 @@ class VToolPointOfIntersectionCircles : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolPointOfIntersectionCircles(VAbstractPattern *doc, VContainer *data, const quint32 &id, const
-                                    quint32 firstCircleCenterId, quint32 secondCircleCenterId,
-                                    const QString &firstCircleRadius, const QString &secondCircleRadius,
-                                    CrossCirclesPoint crossPoint, const Source &typeCreation,
-                                    QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointOfIntersectionCircles *Create(DialogTool *dialog, VMainGraphicsScene  *scene,
                                                    VAbstractPattern *doc,
@@ -92,6 +87,12 @@ private:
     QString secondCircleRadius;
 
     CrossCirclesPoint crossPoint;
+
+    VToolPointOfIntersectionCircles(VAbstractPattern *doc, VContainer *data, const quint32 &id, const
+                                    quint32 firstCircleCenterId, quint32 secondCircleCenterId,
+                                    const QString &firstCircleRadius, const QString &secondCircleRadius,
+                                    CrossCirclesPoint crossPoint, const Source &typeCreation,
+                                    QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTOFINTERSECTIONCIRCLES_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h

@@ -35,10 +35,6 @@ class VToolPointOfIntersectionCurves : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    explicit VToolPointOfIntersectionCurves(VAbstractPattern *doc, VContainer *data, const quint32 &id, const
-                                            quint32 firstCurveId, quint32 secondCurveId,
-                                            VCrossCurvesPoint vCrossPoint, HCrossCurvesPoint hCrossPoint,
-                                            const Source &typeCreation, QGraphicsItem * parent = nullptr);
     virtual void setDialog() Q_DECL_OVERRIDE;
     static VToolPointOfIntersectionCurves *Create(DialogTool *dialog, VMainGraphicsScene  *scene,
                                                   VAbstractPattern *doc, VContainer *data);
@@ -82,6 +78,11 @@ private:
 
     VCrossCurvesPoint vCrossPoint;
     HCrossCurvesPoint hCrossPoint;
+
+    explicit VToolPointOfIntersectionCurves(VAbstractPattern *doc, VContainer *data, const quint32 &id, const
+                                            quint32 firstCurveId, quint32 secondCurveId,
+                                            VCrossCurvesPoint vCrossPoint, HCrossCurvesPoint hCrossPoint,
+                                            const Source &typeCreation, QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLPOINTOFINTERSECTIONCURVES_H

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h

@@ -39,10 +39,6 @@ class VToolTriangle : public VToolSinglePoint
 {
     Q_OBJECT
 public:
-    VToolTriangle(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &axisP1Id,
-                  const quint32 &axisP2Id,
-                  const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation,
-                  QGraphicsItem * parent = nullptr);
     virtual void   setDialog() Q_DECL_OVERRIDE;
     static VToolTriangle *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc,
                                  VContainer *data);
@@ -89,6 +85,11 @@ private:
 
     /** @brief secondPointId id second triangle point, what lies on the hypotenuse. */
     quint32        secondPointId;
+
+    VToolTriangle(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &axisP1Id,
+                  const quint32 &axisP2Id,
+                  const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation,
+                  QGraphicsItem * parent = nullptr);
 };
 
 #endif // VTOOLTRIANGLE_H

src/libs/vtools/tools/drawTools/vtoolline.h

@@ -39,9 +39,6 @@ class VToolLine: public VDrawTool, public QGraphicsLineItem
 {
     Q_OBJECT
 public:
-    VToolLine(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 firstPoint, quint32 secondPoint,
-              const QString &typeLine, const QString &lineColor, const Source &typeCreation,
-              QGraphicsItem * parent = nullptr);
     virtual void     setDialog() Q_DECL_OVERRIDE;
     static VToolLine *Create(DialogTool *dialog, VMainGraphicsScene  *scene, VAbstractPattern *doc, VContainer *data);
     static VToolLine *Create(const quint32 &_id, const quint32 &firstPoint, const quint32 &secondPoint,
@@ -85,12 +82,18 @@ protected:
     virtual void     ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE;
     virtual void     SetVisualization() Q_DECL_OVERRIDE;
 private:
+    Q_DISABLE_COPY(VToolLine)
+
     /** @brief firstPoint id first line point. */
     quint32           firstPoint;
 
     /** @brief secondPoint id second line point. */
     quint32           secondPoint;
 
+    VToolLine(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 firstPoint, quint32 secondPoint,
+              const QString &typeLine, const QString &lineColor, const Source &typeCreation,
+              QGraphicsItem * parent = nullptr);
+
     void             RefreshGeometry();
 };
 

src/libs/vtools/tools/nodeDetails/vnodearc.h

@@ -39,9 +39,6 @@ class VNodeArc :public VAbstractNode
 {
     Q_OBJECT
 public:
-    VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation,
-             const quint32 &idTool = 0, QObject *qoParent = nullptr);
-
     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;
@@ -58,6 +55,9 @@ protected:
     virtual void HideNode() Q_DECL_OVERRIDE {}
 private:
     Q_DISABLE_COPY(VNodeArc)
+
+    VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation,
+             const quint32 &idTool = 0, QObject *qoParent = nullptr);
 };
 
 #endif // VNODEARC_H4

src/libs/vtools/tools/nodeDetails/vnodepoint.h

@@ -44,10 +44,6 @@ class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem
 {
     Q_OBJECT
 public:
-
-    VNodePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idPoint,  const Source &typeCreation,
-               const quint32 &idTool = 0,  QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr );
-
     static void  Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene,
                         quint32 id, quint32 idPoint, const Document &parse,
                         const Source &typeCreation, const quint32 &idTool = 0);
@@ -91,6 +87,9 @@ protected:
     virtual void HideNode() Q_DECL_OVERRIDE;
 private:
     Q_DISABLE_COPY(VNodePoint)
+
+    VNodePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idPoint,  const Source &typeCreation,
+               const quint32 &idTool = 0,  QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr );
 };
 
 #endif // VNODEPOINT_H

src/libs/vtools/tools/nodeDetails/vnodespline.h

@@ -39,9 +39,6 @@ class VNodeSpline:public VAbstractNode
 {
     Q_OBJECT
 public:
-    VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation,
-                const quint32 &idTool = 0, QObject *qoParent = nullptr);
-
     static VNodeSpline *Create(VAbstractPattern *doc, VContainer *data, quint32 id,
                                quint32 idSpline, const Document &parse,
                                const Source &typeCreation, const quint32 &idTool = 0);
@@ -59,6 +56,9 @@ protected:
     virtual void HideNode() Q_DECL_OVERRIDE {}
 private:
     Q_DISABLE_COPY(VNodeSpline)
+
+    VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation,
+                const quint32 &idTool = 0, QObject *qoParent = nullptr);
 };
 
 #endif // VNODESPLINE_H

src/libs/vtools/tools/nodeDetails/vnodesplinepath.h

@@ -39,8 +39,6 @@ class VNodeSplinePath : public VAbstractNode
 {
     Q_OBJECT
 public:
-    VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation,
-                    const quint32 &idTool = 0, QObject *qoParent = nullptr);
     static void  Create(VAbstractPattern *doc, VContainer *data, quint32 id,
                         quint32 idSpline, const Document &parse,
                         const Source &typeCreation, const quint32 &idTool = 0);
@@ -58,6 +56,9 @@ protected:
     virtual void HideNode() Q_DECL_OVERRIDE {}
 private:
     Q_DISABLE_COPY(VNodeSplinePath)
+
+    VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation,
+                    const quint32 &idTool = 0, QObject *qoParent = nullptr);
 };
 
 #endif // VNODESPLINEPATH_H

src/libs/vtools/tools/vtooldetail.h

@@ -42,8 +42,6 @@ class VToolDetail: public VAbstractTool, public VNoBrushScalePathItem
 {
     Q_OBJECT
 public:
-    VToolDetail(VAbstractPattern *doc, VContainer *data, const quint32 &id, const Source &typeCreation,
-                VMainGraphicsScene *scene, const QString &drawName, QGraphicsItem * parent = nullptr);
     ~VToolDetail();
 
     virtual void       setDialog();
@@ -116,6 +114,9 @@ private:
 
     VNoBrushScalePathItem *seamAllowance;
 
+    VToolDetail(VAbstractPattern *doc, VContainer *data, const quint32 &id, const Source &typeCreation,
+                VMainGraphicsScene *scene, const QString &drawName, QGraphicsItem * parent = nullptr);
+
     void               RefreshGeometry ();
     template <typename Tool>
     /**

src/libs/vtools/tools/vtooluniondetails.h

@@ -42,9 +42,6 @@ class VToolUnionDetails : public VAbstractTool
 {
     Q_OBJECT
 public:
-    VToolUnionDetails(VAbstractPattern *doc, VContainer *data, const quint32 &id, const VDetail &d1, const VDetail &d2,
-                      const quint32 &indexD1, const quint32 &indexD2, const Source &typeCreation,
-                      const QString &drawName, QObject *parent = nullptr);
     /**
      * @brief setDialog set dialog when user want change tool option.
      */
@@ -112,6 +109,10 @@ private:
 
     QString      drawName;
 
+    VToolUnionDetails(VAbstractPattern *doc, VContainer *data, const quint32 &id, const VDetail &d1, const VDetail &d2,
+                      const quint32 &indexD1, const quint32 &indexD2, const Source &typeCreation,
+                      const QString &drawName, QObject *parent = nullptr);
+
     void         AddDetail(QDomElement &domElement, VDetail &d);
     void         AddNode(QDomElement &domElement, const VNodeDetail &node);
     QDomNode     UpdateDetail(const QDomNode &domNode, const VDetail &d);