From 71b5a17aa1bbe44bf3726511f5533571a6faa732 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 19 Oct 2017 11:24:21 +0300 Subject: [PATCH] Refactor methods names for better readability. --HG-- branch : develop --- .../tools/drawTools/operation/vabstractoperation.cpp | 2 +- .../tools/drawTools/toolcurve/vabstractspline.cpp | 2 +- .../toolpoint/tooldoublepoint/vtooldoublepoint.cpp | 2 +- .../toolpoint/toolsinglepoint/vtoolbasepoint.cpp | 2 +- .../toolpoint/toolsinglepoint/vtoolbasepoint.h | 2 +- .../toolpoint/toolsinglepoint/vtoolsinglepoint.cpp | 2 +- .../tools/drawTools/toolpoint/vabstractpoint.cpp | 2 +- src/libs/vtools/tools/drawTools/vdrawtool.h | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 2 +- src/libs/vtools/tools/vabstracttool.cpp | 2 +- src/libs/vtools/tools/vabstracttool.h | 2 +- src/libs/vtools/tools/vtoolseamallowance.cpp | 12 ++++++------ src/libs/vtools/tools/vtoolseamallowance.h | 4 ++-- src/libs/vtools/tools/vtooluniondetails.cpp | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp index 6155e1df2..c3729f022 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp @@ -433,7 +433,7 @@ void VAbstractOperation::DeleteFromLabel() { try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 47ea133a6..b3d17518f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -253,7 +253,7 @@ void VAbstractSpline::keyReleaseEvent(QKeyEvent *event) case Qt::Key_Delete: try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index eb0937bef..e384bf580 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -326,7 +326,7 @@ void VToolDoublePoint::keyReleaseEvent(QKeyEvent *event) case Qt::Key_Delete: try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index 423fb2077..7c644b584 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -257,7 +257,7 @@ void VToolBasePoint::SetBasePointPos(const QPointF &pos) } //--------------------------------------------------------------------------------------------------------------------- -void VToolBasePoint::DeleteTool(bool ask) +void VToolBasePoint::DeleteToolWithConfirm(bool ask) { qCDebug(vTool, "Deleting base point."); qApp->getSceneView()->itemClicked(nullptr); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index f1538e259..21696ed9d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -89,7 +89,7 @@ signals: protected: virtual void AddToFile() Q_DECL_OVERRIDE; virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE; + virtual void DeleteToolWithConfirm(bool ask = true) Q_DECL_OVERRIDE; virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index addc1b450..dae587b22 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -280,7 +280,7 @@ void VToolSinglePoint::keyReleaseEvent(QKeyEvent *event) case Qt::Key_Delete: try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index 66b89432a..9b0b3b2fd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -62,7 +62,7 @@ void VAbstractPoint::DeleteFromLabel() { try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 0c7fbff69..8a37f6db8 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -207,7 +207,7 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI else if (selectedAction == actionRemove) { qCDebug(vTool, "Deleting tool."); - DeleteTool(); // do not catch exception here + DeleteToolWithConfirm(); // do not catch exception here return; //Leave this method immediately after call!!! } else if (selectedAction == actionShowLabel) diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index fcb7d5a3e..c054eca18 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -346,7 +346,7 @@ void VToolLine::keyReleaseEvent(QKeyEvent *event) case Qt::Key_Delete: try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index ad97f153c..7228a96c9 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -236,7 +236,7 @@ qreal VAbstractTool::CheckFormula(const quint32 &toolId, QString &formula, VCont /** * @brief DeleteTool full delete object form scene and file. */ -void VAbstractTool::DeleteTool(bool ask) +void VAbstractTool::DeleteToolWithConfirm(bool ask) { qCDebug(vTool, "Deleting abstract tool."); if (_referens <= 1) diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index 0757083bb..7af08426e 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/src/libs/vtools/tools/vabstracttool.h @@ -158,7 +158,7 @@ protected: * @brief RemoveReferens decrement value of reference. */ virtual void RemoveReferens() {} - virtual void DeleteTool(bool ask = true); + virtual void DeleteToolWithConfirm(bool ask = true); static int ConfirmDeletion(); template diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 58d5e9acc..881a490ea 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -153,11 +153,11 @@ VToolSeamAllowance *VToolSeamAllowance::Create(VToolSeamAllowanceInitData &initD } //--------------------------------------------------------------------------------------------------------------------- -void VToolSeamAllowance::Remove(bool ask) +void VToolSeamAllowance::RemoveWithConfirm(bool ask) { try { - DeleteTool(ask); + DeleteToolWithConfirm(ask); } catch(const VExceptionToolWasDeleted &e) { @@ -1129,7 +1129,7 @@ void VToolSeamAllowance::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { try { - DeleteTool(); + DeleteToolWithConfirm(); } catch(const VExceptionToolWasDeleted &e) { @@ -1158,10 +1158,10 @@ void VToolSeamAllowance::keyReleaseEvent(QKeyEvent *event) for(int i=0; i < toolList.size(); ++i) { - toolList.at(i)->Remove(false); + toolList.at(i)->RemoveWithConfirm(false); } } - DeleteTool(false); + DeleteToolWithConfirm(false); } catch(const VExceptionToolWasDeleted &e) { @@ -1585,7 +1585,7 @@ void VToolSeamAllowance::InitPins(const VPiece &detail) } //--------------------------------------------------------------------------------------------------------------------- -void VToolSeamAllowance::DeleteTool(bool ask) +void VToolSeamAllowance::DeleteToolWithConfirm(bool ask) { QScopedPointer delDet(new DeletePiece(doc, m_id, VAbstractTool::data, m_sceneDetails)); if (ask) diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h index 5453a6f9d..74dfced33 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.h +++ b/src/libs/vtools/tools/vtoolseamallowance.h @@ -86,7 +86,7 @@ public: static const QString AttrTopPin; static const QString AttrBottomPin; - void Remove(bool ask); + void RemoveWithConfirm(bool ask); static void InsertNode(VPieceNode node, quint32 pieceId, VMainGraphicsScene *scene, VContainer *data, VAbstractPattern *doc); @@ -149,7 +149,7 @@ protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; virtual void SetVisualization() Q_DECL_OVERRIDE {} - virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE; + virtual void DeleteToolWithConfirm(bool ask = true) Q_DECL_OVERRIDE; virtual void ToolCreation(const Source &typeCreation) Q_DECL_OVERRIDE; virtual void SetDialog() Q_DECL_FINAL; virtual void SaveDialogChange() Q_DECL_FINAL; diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 94dea8dd1..7281d8a37 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -1368,7 +1368,7 @@ void CreateUnitedDetail(const VToolUnionDetailsInitData &initData, qreal dx, qre VToolSeamAllowance *toolDet = qobject_cast(VAbstractPattern::getTool(id)); SCASSERT(toolDet != nullptr); bool ask = false; - toolDet->Remove(ask); + toolDet->RemoveWithConfirm(ask); }; if (not initData.retainPieces)