From cf4145dd945d024c8737f5709b3b53ac5193b2fc Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Mon, 22 Aug 2022 09:15:09 +0300
Subject: [PATCH] Refactoring.

---
 src/libs/vtools/dialogs/tools/dialogalongline.cpp           | 4 ++--
 src/libs/vtools/dialogs/tools/dialogalongline.h             | 3 +++
 src/libs/vtools/dialogs/tools/dialogbisector.cpp            | 6 +++---
 src/libs/vtools/dialogs/tools/dialogbisector.h              | 3 +++
 src/libs/vtools/dialogs/tools/dialogcubicbezier.h           | 3 +++
 src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h    | 3 +++
 src/libs/vtools/dialogs/tools/dialogflippingbyline.h        | 3 +++
 src/libs/vtools/dialogs/tools/dialogheight.cpp              | 6 +++---
 src/libs/vtools/dialogs/tools/dialogheight.h                | 3 +++
 src/libs/vtools/dialogs/tools/dialogline.h                  | 3 +++
 src/libs/vtools/dialogs/tools/dialoglineintersect.h         | 3 +++
 src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h     | 3 +++
 src/libs/vtools/dialogs/tools/dialognormal.cpp              | 4 ++--
 src/libs/vtools/dialogs/tools/dialognormal.h                | 3 +++
 .../vtools/dialogs/tools/dialogpointfromarcandtangent.h     | 3 +++
 .../vtools/dialogs/tools/dialogpointfromcircleandtangent.h  | 2 ++
 src/libs/vtools/dialogs/tools/dialogpointofcontact.h        | 3 +++
 src/libs/vtools/dialogs/tools/dialogpointofintersection.h   | 3 +++
 .../vtools/dialogs/tools/dialogpointofintersectionarcs.h    | 3 +++
 .../dialogs/tools/dialogpointofintersectioncircles.cpp      | 6 +++---
 .../vtools/dialogs/tools/dialogpointofintersectioncircles.h | 3 +++
 .../vtools/dialogs/tools/dialogpointofintersectioncurves.h  | 3 +++
 src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp       | 6 +++---
 src/libs/vtools/dialogs/tools/dialogshoulderpoint.h         | 3 +++
 src/libs/vtools/dialogs/tools/dialogspline.h                | 3 +++
 src/libs/vtools/dialogs/tools/dialogtool.cpp                | 1 -
 src/libs/vtools/dialogs/tools/dialogtool.h                  | 3 ---
 src/libs/vtools/dialogs/tools/dialogtriangle.h              | 3 +++
 src/libs/vtools/dialogs/tools/dialogtruedarts.h             | 3 +++
 29 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
index aa77b34d9..a247aec3d 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
@@ -197,12 +197,12 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type)
         SCASSERT(line != nullptr)
 
         const QString toolTip = tr("Select second point of line");
-        switch (number)
+        switch (m_number)
         {
             case 0:
                 if (SetObject(id, ui->comboBoxFirstPoint, toolTip))
                 {
-                    number++;
+                    m_number++;
                     line->VisualMode(id);
                 }
                 break;
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h
index edacc5364..bbafb79c0 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.h
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.h
@@ -118,6 +118,9 @@ private:
 
     bool m_firstRelease{false};
 
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
+
     void SetCurrentLength();
 
     void ChosenSecondPoint(quint32 id, const QString &toolTip);
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
index af72a2bdb..ab2cccb18 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
@@ -203,12 +203,12 @@ void DialogBisector::ChosenObject(quint32 id, const SceneObject &type)
         auto *line = qobject_cast<VisToolBisector *>(vis);
         SCASSERT(line != nullptr)
 
-        switch (number)
+        switch (m_number)
         {
             case 0:
                 if (SetObject(id, ui->comboBoxFirstPoint, tr("Select second point of angle")))
                 {
-                    number++;
+                    m_number++;
                     line->VisualMode(id);
                 }
                 break;
@@ -217,7 +217,7 @@ void DialogBisector::ChosenObject(quint32 id, const SceneObject &type)
                 {
                     if (SetObject(id, ui->comboBoxSecondPoint, tr("Select third point of angle")))
                     {
-                        number++;
+                        m_number++;
                         line->setObject2Id(id);
                         line->RefreshGeometry();
                     }
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h
index de2732f0f..972fe19b5 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.h
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.h
@@ -118,6 +118,9 @@ private:
 
     bool m_firstRelease{false};
 
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
+
     void ChosenThirdPoint(quint32 id);
 };
 
diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
index 117e26604..7c19a8077 100644
--- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h
@@ -85,6 +85,9 @@ private:
 
     QString originAliasSuffix{};
 
+    /** @brief number number of handled objects */
+    qint32 number{0};
+
     const QSharedPointer<VPointF> GetP1() const;
     const QSharedPointer<VPointF> GetP2() const;
     const QSharedPointer<VPointF> GetP3() const;
diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
index c4024fa1d..9b44c567c 100644
--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
@@ -114,6 +114,9 @@ private:
 
     QString originAliasSuffix1{};
     QString originAliasSuffix2{};
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h
index 98261e419..4ab384508 100644
--- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h
+++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h
@@ -123,6 +123,9 @@ private:
 
     QStringList m_groupTags{};
 
+    /** @brief number number of handled objects */
+    qint32 number{0};
+
     void FillSourceList();
 
     void ValidateSourceAliases();
diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp
index dd649fca6..ac512d03a 100644
--- a/src/libs/vtools/dialogs/tools/dialogheight.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp
@@ -198,12 +198,12 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type)
         auto *line = qobject_cast<VisToolHeight *>(vis);
         SCASSERT(line != nullptr)
 
-        switch (number)
+        switch (m_number)
         {
             case (0):
                 if (SetObject(id, ui->comboBoxBasePoint, tr("Select first point of line")))
                 {
-                    number++;
+                    m_number++;
                     line->VisualMode(id);
                 }
                 break;
@@ -212,7 +212,7 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type)
                 {
                     if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line")))
                     {
-                        number++;
+                        m_number++;
                         line->setLineP1Id(id);
                         line->RefreshGeometry();
                     }
diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h
index 6f6f046e8..02d8170f9 100644
--- a/src/libs/vtools/dialogs/tools/dialogheight.h
+++ b/src/libs/vtools/dialogs/tools/dialogheight.h
@@ -93,6 +93,9 @@ private:
 
     bool m_flagError{true};
     bool m_flagName{true};
+
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogline.h b/src/libs/vtools/dialogs/tools/dialogline.h
index c9aaefd06..cc4148035 100644
--- a/src/libs/vtools/dialogs/tools/dialogline.h
+++ b/src/libs/vtools/dialogs/tools/dialogline.h
@@ -84,6 +84,9 @@ private:
     Ui::DialogLine *ui;
 
     bool flagError;
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h
index ec94fbcf2..9e8afd7b8 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h
@@ -96,6 +96,9 @@ private:
 
     bool flagName;
 
+    /** @brief number number of handled objects */
+    qint32 number{0};
+
     bool                    CheckIntersecion();
 };
 
diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
index 368d3ab21..4e5fdbcc9 100644
--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h
@@ -106,6 +106,9 @@ private:
     bool flagFormula;
     bool flagError;
     bool flagName;
+
+    /** @brief number number of handled objects */
+    qint32 number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp
index 13fcafe5f..e07f067bb 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.cpp
+++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp
@@ -203,12 +203,12 @@ void DialogNormal::ChosenObject(quint32 id, const SceneObject &type)
         auto *line = qobject_cast<VisToolNormal *>(vis);
         SCASSERT(line != nullptr)
 
-        switch (number)
+        switch (m_number)
         {
             case 0:
                 if (SetObject(id, ui->comboBoxFirstPoint, tr("Select second point of line")))
                 {
-                    number++;
+                    m_number++;
                     line->VisualMode(id);
                 }
                 break;
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h
index 74c32c87a..947cd3811 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.h
+++ b/src/libs/vtools/dialogs/tools/dialognormal.h
@@ -119,6 +119,9 @@ private:
     bool m_flagError{true};
 
     bool m_firstRelease{false};
+
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
index 4ca99e38e..4f60808f9 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h
@@ -86,6 +86,9 @@ private:
     QString pointName;
 
     bool flagName;
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
index 9434995a2..7cc5dfdb1 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
@@ -99,6 +99,8 @@ private:
     bool    flagCircleRadius;
     bool    flagName;
     bool    flagError;
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
index 0c2b3f8c3..578ac04dd 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h
@@ -107,6 +107,9 @@ private:
     bool flagFormula;
     bool flagName;
     bool flagError;
+
+    /** @brief number number of handled objects */
+    qint32 number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
index a2f814169..bd36d9693 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h
@@ -84,6 +84,9 @@ private:
 
     bool flagName;
     bool flagError;
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
index 986da98ba..e1aae9d91 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h
@@ -88,6 +88,9 @@ private:
 
     bool flagName;
     bool flagError;
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
index dbb1a2ca7..eeb999320 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
@@ -255,12 +255,12 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec
         auto *point = qobject_cast<VisToolPointOfIntersectionCircles *>(vis);
         SCASSERT(point != nullptr)
 
-        switch (number)
+        switch (m_number)
         {
             case 0:
                 if (SetObject(id, ui->comboBoxCircle1Center, tr("Select second circle center")))
                 {
-                    number++;
+                    m_number++;
                     point->VisualMode(id);
                 }
                 break;
@@ -269,7 +269,7 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec
                 {
                     if (SetObject(id, ui->comboBoxCircle2Center, QString()))
                     {
-                        number = 0;
+                        m_number = 0;
                         point->setObject2Id(id);
                         point->RefreshGeometry();
                         prepare = true;
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
index 9159a13ad..be3d1e0f4 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
@@ -115,6 +115,9 @@ private:
     bool m_flagCircle2Radius{false};
     bool m_flagName{true};
     bool m_flagError{true};
+
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
index 3a7088c4f..648eddf1e 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
@@ -115,6 +115,9 @@ private:
     QString originCurve1AliasSuffix2{};
     QString originCurve2AliasSuffix1{};
     QString originCurve2AliasSuffix2{};
+
+    /** @brief number number of handled objects */
+    qint32 number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
index bebe4d616..1b6644d25 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
@@ -201,12 +201,12 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type)
         auto *line = qobject_cast<VisToolShoulderPoint *>(vis);
         SCASSERT(line != nullptr)
 
-        switch (number)
+        switch (m_number)
         {
             case 0:
                 if (SetObject(id, ui->comboBoxP3, tr("Select first point of line")))
                 {
-                    number++;
+                    m_number++;
                     line->VisualMode(id);
                 }
                 break;
@@ -215,7 +215,7 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type)
                 {
                     if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line")))
                     {
-                        number++;
+                        m_number++;
                         line->setLineP1Id(id);
                         line->RefreshGeometry();
                     }
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
index ef62d04e8..1c3003cce 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h
@@ -117,6 +117,9 @@ private:
 
     bool m_firstRelease{false};
 
+    /** @brief number number of handled objects */
+    qint32 m_number{0};
+
     void ChosenThirdPoint(quint32 id);
 };
 
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h
index fa0507343..fe4a660e1 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.h
+++ b/src/libs/vtools/dialogs/tools/dialogspline.h
@@ -123,6 +123,9 @@ private:
 
     QString originAliasSuffix{};
 
+    /** @brief number number of handled objects */
+    qint32 number{0};
+
     const QSharedPointer<VPointF> GetP1() const;
     const QSharedPointer<VPointF> GetP4() const;
 
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp
index a7b91d651..09dd25afd 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@@ -94,7 +94,6 @@ DialogTool::DialogTool(const VContainer *data, quint32 toolId, QWidget *parent)
       associatedTool(nullptr),
       toolId(toolId),
       prepare(false),
-      number(0),
       vis(nullptr)
 {
     SCASSERT(data != nullptr)      
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h
index 915df420d..17914efe2 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.h
+++ b/src/libs/vtools/dialogs/tools/dialogtool.h
@@ -148,9 +148,6 @@ protected:
     /** @brief prepare show if we prepare. Show dialog after finish working with visual part of tool*/
     bool             prepare;
 
-    /** @brief number number of handled objects */
-    qint32           number;
-
     QPointer<Visualization> vis;
 
     virtual void     closeEvent ( QCloseEvent * event ) override;
diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h
index 938981b02..b175f1572 100644
--- a/src/libs/vtools/dialogs/tools/dialogtriangle.h
+++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h
@@ -90,6 +90,9 @@ private:
 
     bool flagName;
     bool flagError;
+
+    /** @brief number number of handled objects */
+    qint32  number{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h
index 2fa234e63..3d064549d 100644
--- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h
+++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h
@@ -101,6 +101,9 @@ private:
     bool flagName2;
     bool flagError;
 
+    /** @brief number number of handled objects */
+    qint32 number{0};
+
     void NameChanged(QLabel *labelEditNamePoint, const QString &pointD1Name, const QString &pointD2Name,
                      QLineEdit *secondPointName, bool &flagName);