From 39aa43fe8fbd5025295f39028839a4bf91b42fed Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 13 Sep 2017 11:52:41 +0300 Subject: [PATCH] SonarQube warnings. --HG-- branch : develop --- .../dialogs/configpages/preferencespathpage.cpp | 2 +- .../configpages/preferencespatternpage.cpp | 8 ++++---- .../dialogs/dialogpatternproperties.cpp | 12 ++++-------- src/app/valentina/xml/vpattern.cpp | 8 ++++---- src/libs/vpropertyexplorer/vpropertyformview.cpp | 11 +++++++---- .../vpropertyexplorer/vpropertyformwidget.cpp | 4 ++-- src/libs/vpropertyexplorer/vpropertyset.cpp | 6 +----- .../dialogs/support/dialogeditwrongformula.cpp | 1 - .../vtools/dialogs/tools/dialoguniondetails.cpp | 3 --- .../operation/flipping/vtoolflippingbyaxis.cpp | 2 +- .../operation/flipping/vtoolflippingbyline.cpp | 2 +- .../tools/drawTools/operation/vtoolmove.cpp | 2 +- .../tools/drawTools/operation/vtoolrotation.cpp | 2 +- .../tools/drawTools/toolcurve/vtoolarc.cpp | 2 +- .../drawTools/toolcurve/vtoolarcwithlength.cpp | 2 +- .../drawTools/toolcurve/vtoolcubicbezier.cpp | 2 +- .../drawTools/toolcurve/vtoolcubicbezierpath.cpp | 2 +- .../drawTools/toolcurve/vtoolellipticalarc.cpp | 2 +- .../tools/drawTools/toolcurve/vtoolspline.cpp | 2 +- .../drawTools/toolcurve/vtoolsplinepath.cpp | 2 +- .../toolpoint/tooldoublepoint/vtooltruedarts.cpp | 2 +- .../toolsinglepoint/toolcut/vtoolcutarc.cpp | 2 +- .../toolsinglepoint/toolcut/vtoolcutspline.cpp | 2 +- .../toolcut/vtoolcutsplinepath.cpp | 2 +- .../toollinepoint/vtoolalongline.cpp | 2 +- .../toollinepoint/vtoolbisector.cpp | 2 +- .../toollinepoint/vtoolcurveintersectaxis.cpp | 2 +- .../toollinepoint/vtoolendline.cpp | 2 +- .../toollinepoint/vtoolheight.cpp | 2 +- .../toollinepoint/vtoollineintersectaxis.cpp | 2 +- .../toollinepoint/vtoolnormal.cpp | 2 +- .../toollinepoint/vtoolshoulderpoint.cpp | 2 +- .../toolpoint/toolsinglepoint/vtoolbasepoint.cpp | 2 +- .../toolsinglepoint/vtoollineintersect.cpp | 2 +- .../vtoolpointfromarcandtangent.cpp | 2 +- .../vtoolpointfromcircleandtangent.cpp | 2 +- .../toolsinglepoint/vtoolpointofcontact.cpp | 2 +- .../toolsinglepoint/vtoolpointofintersection.cpp | 2 +- .../vtoolpointofintersectionarcs.cpp | 2 +- .../vtoolpointofintersectioncircles.cpp | 2 +- .../vtoolpointofintersectioncurves.cpp | 16 ++++------------ .../toolpoint/toolsinglepoint/vtooltriangle.cpp | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 4 ++-- src/libs/vtools/tools/vtoolseamallowance.cpp | 2 +- src/libs/vtools/tools/vtooluniondetails.cpp | 1 - src/libs/vtools/undocommands/adddetnode.cpp | 4 ---- src/libs/vtools/undocommands/deletepiece.cpp | 4 +--- .../undocommands/label/movedoublelabel.cpp | 2 -- src/libs/vtools/undocommands/label/movelabel.cpp | 2 -- .../undocommands/label/operationmovelabel.cpp | 4 +--- src/libs/vtools/undocommands/movepiece.cpp | 3 --- src/libs/vtools/undocommands/movespline.cpp | 1 - src/libs/vtools/undocommands/movesplinepath.cpp | 1 - src/libs/vtools/undocommands/movespoint.cpp | 2 -- .../vtools/undocommands/savepieceoptions.cpp | 2 -- .../vtools/undocommands/savepiecepathoptions.cpp | 2 -- src/libs/vtools/undocommands/savetooloptions.cpp | 2 -- .../vtools/undocommands/togglepieceinlayout.cpp | 1 - .../visualization/line/vistoollineintersect.cpp | 6 +----- .../visualization/line/vistoolpointofcontact.cpp | 6 +----- .../visualization/line/vistooltriangle.cpp | 6 +----- src/libs/vwidgets/vgrainlineitem.cpp | 1 - src/libs/vwidgets/vmaingraphicsview.cpp | 4 ++-- src/libs/vwidgets/vtextgraphicsitem.cpp | 1 - 64 files changed, 69 insertions(+), 127 deletions(-) diff --git a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp index c1cb7ff4d..ed6cb1384 100644 --- a/src/app/valentina/dialogs/configpages/preferencespathpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencespathpage.cpp @@ -93,7 +93,7 @@ void PreferencesPathPage::DefaultPath() path = VCommonSettings::GetDefPathTemplate(); break; case 5: // label templates - path = VSettings::GetDefPathLabelTemplate(); + path = VCommonSettings::GetDefPathLabelTemplate(); break; default: break; diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp index 745c9e7c6..0be1b6430 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp @@ -138,12 +138,12 @@ void PreferencesPatternPage::EditDateTimeFormats() QPushButton *button = qobject_cast(sender()); if (button == ui->pushButtonEditDateFormats) { - CallDateTimeFormatEditor(QDate::currentDate(), settings->PredefinedDateFormats(), + CallDateTimeFormatEditor(QDate::currentDate(), VCommonSettings::PredefinedDateFormats(), settings->GetUserDefinedDateFormats(), ui->comboBoxDateFormats); } else if (button == ui->pushButtonEditTimeFormats) { - CallDateTimeFormatEditor(QTime::currentTime(), settings->PredefinedTimeFormats(), + CallDateTimeFormatEditor(QTime::currentTime(), VCommonSettings::PredefinedTimeFormats(), settings->GetUserDefinedTimeFormats(), ui->comboBoxTimeFormats); } } @@ -166,10 +166,10 @@ void PreferencesPatternPage::InitLabelDateTimeFormats() VSettings *settings = qApp->ValentinaSettings(); InitComboBoxFormats(ui->comboBoxDateFormats, - VSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(), + VCommonSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(), settings->GetLabelDateFormat()); InitComboBoxFormats(ui->comboBoxTimeFormats, - VSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(), + VCommonSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(), settings->GetLabelTimeFormat()); connect(ui->pushButtonEditDateFormats, &QPushButton::clicked, this, &PreferencesPatternPage::EditDateTimeFormats); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 3b7683924..f9c0680f8 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -191,10 +191,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, VContainer *pat &DialogPatternProperties::ManagePatternMaterials); InitComboBoxFormats(ui->comboBoxDateFormat, - VSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(), + VCommonSettings::PredefinedDateFormats() + settings->GetUserDefinedDateFormats(), doc->GetLabelDateFormat()); InitComboBoxFormats(ui->comboBoxTimeFormat, - VSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(), + VCommonSettings::PredefinedTimeFormats() + settings->GetUserDefinedTimeFormats(), doc->GetLabelTimeFormat()); connect(ui->comboBoxDateFormat, static_cast(&QComboBox::currentIndexChanged), @@ -824,13 +824,9 @@ void DialogPatternProperties::ChangeImage() const QString filter = tr("Images") + QLatin1String(" (*.png *.jpg *.jpeg *.bmp)"); const QString fileName = QFileDialog::getOpenFileName(this, tr("Image for pattern"), QString(), filter, nullptr, QFileDialog::DontUseNativeDialog); - QImage image; - if (fileName.isEmpty()) - { - return; - } - else + if (not fileName.isEmpty()) { + QImage image; if (not image.load(fileName)) { return; diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 35544e646..4f206a78c 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -3067,13 +3067,13 @@ void VPattern::GarbageCollector() { // First get next sibling because later will not have chance to get it QDomElement nextSibling = modNode.nextSibling().toElement(); - if (modNode.hasAttribute(VAbstractNode::AttrInUse)) + if (modNode.hasAttribute(VAbstractTool::AttrInUse)) { - const NodeUsage inUse = GetParametrUsage(modNode, VAbstractNode::AttrInUse); + const NodeUsage inUse = GetParametrUsage(modNode, VAbstractTool::AttrInUse); if (inUse == NodeUsage::InUse) { // It is dangerous to leave object with attribute 'inUse' // Each parse should confirm this status. - SetParametrUsage(modNode, VAbstractNode::AttrInUse, NodeUsage::NotInUse); + SetParametrUsage(modNode, VAbstractTool::AttrInUse, NodeUsage::NotInUse); } else { // Parent was deleted. We do not need this object anymore @@ -3082,7 +3082,7 @@ void VPattern::GarbageCollector() } else { // Each parse should confirm his status. - SetParametrUsage(modNode, VAbstractNode::AttrInUse, NodeUsage::NotInUse); + SetParametrUsage(modNode, VAbstractTool::AttrInUse, NodeUsage::NotInUse); } modNode = nextSibling; diff --git a/src/libs/vpropertyexplorer/vpropertyformview.cpp b/src/libs/vpropertyexplorer/vpropertyformview.cpp index 27b929039..cc67ff2e5 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformview.cpp @@ -135,10 +135,13 @@ void VPE::VPropertyFormView::dataChanged(const QModelIndex &top_left, const QMod { Q_UNUSED(top_left) Q_UNUSED(bottom_right) - if (static_cast(d_ptr)->IgnoreDataChangedSignal) - { - return; - } + + // Ucomment when handle data changes +// if (static_cast(d_ptr)->IgnoreDataChangedSignal) +// { +// return; +// } + // todo: handle data changes } diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp index 2d0744953..3a9a6d9ca 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp @@ -78,8 +78,8 @@ void VPE::VPropertyFormWidget::build() d_ptr->EditorWidgets.clear(); if (layout()) { - QLayoutItem *child; - while (layout()->count() > 0 && (child = layout()->takeAt(0)) != nullptr) + QLayoutItem *child = layout()->takeAt(0); + while (layout()->count() > 0 && child != nullptr) { if (child->widget()) { diff --git a/src/libs/vpropertyexplorer/vpropertyset.cpp b/src/libs/vpropertyexplorer/vpropertyset.cpp index cc37a5d6f..0a7ca39d8 100644 --- a/src/libs/vpropertyexplorer/vpropertyset.cpp +++ b/src/libs/vpropertyexplorer/vpropertyset.cpp @@ -221,11 +221,7 @@ bool VPE::VPropertySet::hasProperty(VProperty *property, VProperty *parent) cons const QList& tmpChildrenList = (parent != nullptr ? parent->getChildren() : d_ptr->RootProperties); foreach(VProperty* tmpProp, tmpChildrenList) { - if (!tmpProp) - { - continue; - } - else if (tmpProp == property || hasProperty(property, tmpProp)) + if (tmpProp && (tmpProp == property || hasProperty(property, tmpProp))) { return true; } diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index c72dcdad6..08b4e3ee6 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -222,7 +222,6 @@ void DialogEditWrongFormula::ValChanged(int row) if (ui->radioButtonFunctions->isChecked()) { ui->labelDescription->setText(item->toolTip()); - return; } } diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp index 966b03b92..1693311e9 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp @@ -177,7 +177,6 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &typ emit ToolTip(""); this->setModal(true); this->show(); - return; } else { @@ -185,13 +184,11 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &typ p1 = 0; p2 = 0; emit ToolTip(tr("Select a detail")); - return; } } else { emit ToolTip(tr("Select a point on edge")); - return; } } } diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index 22af6206f..bc8af184f 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -124,7 +124,7 @@ VToolFlippingByAxis *VToolFlippingByAxis::Create(const quint32 _id, quint32 orig if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::FlippingByAxis, doc); + VAbstractTool::AddRecord(id, Tool::FlippingByAxis, doc); VToolFlippingByAxis *tool = new VToolFlippingByAxis(doc, data, id, originPointId, axisType, suffix, source, dest, typeCreation); scene->addItem(tool); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index d68d8a6b7..1fe000a41 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -118,7 +118,7 @@ VToolFlippingByLine *VToolFlippingByLine::Create(const quint32 _id, quint32 firs if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::FlippingByLine, doc); + VAbstractTool::AddRecord(id, Tool::FlippingByLine, doc); VToolFlippingByLine *tool = new VToolFlippingByLine(doc, data, id, firstLinePointId, secondLinePointId, suffix, source, dest, typeCreation); scene->addItem(tool); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index 10706f229..a789105ea 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp @@ -219,7 +219,7 @@ QT_WARNING_POP if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Move, doc); + VAbstractTool::AddRecord(id, Tool::Move, doc); VToolMove *tool = new VToolMove(doc, data, id, formulaAngle, formulaLength, suffix, source, dest, typeCreation); scene->addItem(tool); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index 886c57385..f7f083124 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -236,7 +236,7 @@ QT_WARNING_POP if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Rotation, doc); + VAbstractTool::AddRecord(id, Tool::Rotation, doc); VToolRotation *tool = new VToolRotation(doc, data, id, origin, angle, suffix, source, dest, typeCreation); scene->addItem(tool); InitOperationToolConnections(scene, tool); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 6dcec2687..0a27ac1e9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -172,7 +172,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Arc, doc); + VAbstractTool::AddRecord(id, Tool::Arc, doc); VToolArc *toolArc = new VToolArc(doc, data, id, typeCreation); scene->addItem(toolArc); InitArcToolConnections(scene, toolArc); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 1d65d10e9..6bf095412 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -141,7 +141,7 @@ VToolArcWithLength *VToolArcWithLength::Create(const quint32 _id, const quint32 if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::ArcWithLength, doc); + VAbstractTool::AddRecord(id, Tool::ArcWithLength, doc); VToolArcWithLength *toolArc = new VToolArcWithLength(doc, data, id, typeCreation); scene->addItem(toolArc); InitArcToolConnections(scene, toolArc); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index ad40ce8e2..25a07b436 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -124,7 +124,7 @@ VToolCubicBezier *VToolCubicBezier::Create(const quint32 _id, VCubicBezier *spli if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CubicBezier, doc); + VAbstractTool::AddRecord(id, Tool::CubicBezier, doc); auto _spl = new VToolCubicBezier(doc, data, id, typeCreation); scene->addItem(_spl); InitSplineToolConnections(scene, _spl); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index 34cbd80c7..638e8a1e4 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -130,7 +130,7 @@ VToolCubicBezierPath *VToolCubicBezierPath::Create(const quint32 _id, VCubicBezi if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CubicBezierPath, doc); + VAbstractTool::AddRecord(id, Tool::CubicBezierPath, doc); VToolCubicBezierPath *spl = new VToolCubicBezierPath(doc, data, id, typeCreation); scene->addItem(spl); InitSplinePathToolConnections(scene, spl); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index d669c8dd0..6a5fd9c64 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -185,7 +185,7 @@ VToolEllipticalArc* VToolEllipticalArc::Create(const quint32 _id, const quint32 if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::EllipticalArc, doc); + VAbstractTool::AddRecord(id, Tool::EllipticalArc, doc); VToolEllipticalArc *toolEllipticalArc = new VToolEllipticalArc(doc, data, id, typeCreation); scene->addItem(toolEllipticalArc); InitElArcToolConnections(scene, toolEllipticalArc); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 40f863f0c..60349dc2c 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -200,7 +200,7 @@ VToolSpline* VToolSpline::Create(const quint32 _id, VSpline *spline, VMainGraphi if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Spline, doc); + VAbstractTool::AddRecord(id, Tool::Spline, doc); auto _spl = new VToolSpline(doc, data, id, typeCreation); scene->addItem(_spl); InitSplineToolConnections(scene, _spl); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 5e3336a2d..2968e8a44 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -211,7 +211,7 @@ VToolSplinePath* VToolSplinePath::Create(const quint32 _id, VSplinePath *path, V if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::SplinePath, doc); + VAbstractTool::AddRecord(id, Tool::SplinePath, doc); VToolSplinePath *spl = new VToolSplinePath(doc, data, id, typeCreation); scene->addItem(spl); InitSplinePathToolConnections(scene, spl); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 9a6c7e8e2..45c93bb91 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -191,7 +191,7 @@ VToolTrueDarts *VToolTrueDarts::Create(quint32 _id, if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::TrueDarts, doc); + VAbstractTool::AddRecord(id, Tool::TrueDarts, doc); VToolTrueDarts *points = new VToolTrueDarts(doc, data, id, p1id, p2id, baseLineP1Id, baseLineP2Id, dartP1Id, dartP2Id, dartP3Id, typeCreation); scene->addItem(points); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index bd6d2491a..0e6ce4490 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -170,7 +170,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CutArc, doc); + VAbstractTool::AddRecord(id, Tool::CutArc, doc); VToolCutArc *point = new VToolCutArc(doc, data, id, formula, arcId, typeCreation); scene->addItem(point); InitToolConnections(scene, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index ce18b7eb1..23d971ba9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -170,7 +170,7 @@ VToolCutSpline* VToolCutSpline::Create(const quint32 _id, const QString &pointNa if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CutSpline, doc); + VAbstractTool::AddRecord(id, Tool::CutSpline, doc); VToolCutSpline *point = new VToolCutSpline(doc, data, id, formula, splineId, typeCreation); scene->addItem(point); InitToolConnections(scene, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 12301fcf7..fdc9009b5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -181,7 +181,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CutSplinePath, doc); + VAbstractTool::AddRecord(id, Tool::CutSplinePath, doc); VToolCutSplinePath *point = new VToolCutSplinePath(doc, data, id, formula, splinePathId, typeCreation); scene->addItem(point); InitToolConnections(scene, point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index af26f2a24..9777303c2 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -317,7 +317,7 @@ VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointNa VToolAlongLine *point = nullptr; if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::AlongLine, doc); + VAbstractTool::AddRecord(id, Tool::AlongLine, doc); point = new VToolAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, lineColor, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 9ae59a10f..db8242cf6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -215,7 +215,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Bisector, doc); + VAbstractTool::AddRecord(id, Tool::Bisector, doc); VToolBisector *point = new VToolBisector(doc, data, id, typeLine, lineColor, formula, firstPointId, secondPointId, thirdPointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index adc49e031..05831cc3a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -162,7 +162,7 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(const quint32 _id, cons if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::CurveIntersectAxis, doc); + VAbstractTool::AddRecord(id, Tool::CurveIntersectAxis, doc); VToolCurveIntersectAxis *point = new VToolCurveIntersectAxis(doc, data, id, typeLine, lineColor, formulaAngle, basePointId, curveId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 39a8a2512..b34845f5a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -177,7 +177,7 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::EndLine, doc); + VAbstractTool::AddRecord(id, Tool::EndLine, doc); VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, lineColor, formulaLength, formulaAngle, basePointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 3e1728064..169940ea7 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -175,7 +175,7 @@ VToolHeight* VToolHeight::Create(const quint32 _id, const QString &pointName, co if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Height, doc); + VAbstractTool::AddRecord(id, Tool::Height, doc); VToolHeight *point = new VToolHeight(doc, data, id, typeLine, lineColor, basePointId, p1LineId, p2LineId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 77b755a23..4cbec8946 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -149,7 +149,7 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(const quint32 _id, const if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::LineIntersectAxis, doc); + VAbstractTool::AddRecord(id, Tool::LineIntersectAxis, doc); VToolLineIntersectAxis *point = new VToolLineIntersectAxis(doc, data, id, typeLine, lineColor, formulaAngle, basePointId, firstPointId, secondPointId, typeCreation); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 5976f73be..cefc4d031 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -179,7 +179,7 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Normal, doc); + VAbstractTool::AddRecord(id, Tool::Normal, doc); VToolNormal *point = new VToolNormal(doc, data, id, typeLine, lineColor, formula, angle, firstPointId, secondPointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index e139e4fa7..7a9e3db4d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -232,7 +232,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::ShoulderPoint, doc); + VAbstractTool::AddRecord(id, Tool::ShoulderPoint, doc); VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, lineColor, formula, p1Line, p2Line, pShoulder, typeCreation); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index 565aa89ab..7070218a6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -126,7 +126,7 @@ VToolBasePoint *VToolBasePoint::Create(quint32 _id, const QString &nameActivPP, if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::BasePoint, doc); + VAbstractTool::AddRecord(id, Tool::BasePoint, doc); VToolBasePoint *spoint = new VToolBasePoint(doc, data, id, typeCreation, nameActivPP); scene->addItem(spoint); InitToolConnections(scene, spoint); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index bf438deb8..ebc62a94b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -183,7 +183,7 @@ VToolLineIntersect* VToolLineIntersect::Create(const quint32 _id, const quint32 if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::LineIntersect, doc); + VAbstractTool::AddRecord(id, Tool::LineIntersect, doc); VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 17bf93d9d..114896457 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -126,7 +126,7 @@ VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(const quint32 _ if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointFromArcAndTangent, doc); + VAbstractTool::AddRecord(id, Tool::PointFromArcAndTangent, doc); VToolPointFromArcAndTangent *point = new VToolPointFromArcAndTangent(doc, data, id, arcId, tangentPointId, crossPoint, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 5ea4feebf..edf47eabf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -135,7 +135,7 @@ VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(const qui if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointFromCircleAndTangent, doc); + VAbstractTool::AddRecord(id, Tool::PointFromCircleAndTangent, doc); VToolPointFromCircleAndTangent *point = new VToolPointFromCircleAndTangent(doc, data, id, circleCenterId, circleRadius, tangentPointId, crossPoint, typeCreation); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index 521f36075..6a485ad78 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -237,7 +237,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointOfContact, doc); + VAbstractTool::AddRecord(id, Tool::PointOfContact, doc); VToolPointOfContact *point = new VToolPointOfContact(doc, data, id, radius, center, firstPointId, secondPointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index b7913b289..7a920d9bd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -157,7 +157,7 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const quint32 _id, co if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointOfIntersection, doc); + VAbstractTool::AddRecord(id, Tool::PointOfIntersection, doc); VToolPointOfIntersection *point = new VToolPointOfIntersection(doc, data, id, firstPointId, secondPointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index 2b372ba6a..4b698ec9f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -127,7 +127,7 @@ VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(const quint32 if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointOfIntersectionArcs, doc); + VAbstractTool::AddRecord(id, Tool::PointOfIntersectionArcs, doc); VToolPointOfIntersectionArcs *point = new VToolPointOfIntersectionArcs(doc, data, id, firstArcId, secondArcId, pType, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index e7ae1564f..272d0f2ac 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -148,7 +148,7 @@ VToolPointOfIntersectionCircles *VToolPointOfIntersectionCircles::Create(const q if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointOfIntersectionCircles, doc); + VAbstractTool::AddRecord(id, Tool::PointOfIntersectionCircles, doc); VToolPointOfIntersectionCircles *point = new VToolPointOfIntersectionCircles(doc, data, id, firstCircleCenterId, secondCircleCenterId, firstCircleRadius, diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index 0ff3f96b6..3242ce3e2 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -136,7 +136,7 @@ VToolPointOfIntersectionCurves *VToolPointOfIntersectionCurves::Create(const qui if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::PointOfIntersectionCurves, doc); + VAbstractTool::AddRecord(id, Tool::PointOfIntersectionCurves, doc); auto point = new VToolPointOfIntersectionCurves(doc, data, id, firstCurveId, secondCurveId, vCrossPoint, hCrossPoint, typeCreation); scene->addItem(point); @@ -185,17 +185,13 @@ QPointF VToolPointOfIntersectionCurves::FindPoint(const QVector &curve1 for ( auto i = 1; i < intersections.count(); ++i ) { const QPointF p = intersections.at(i); - if (p.y() > minY) - { - continue; - } - else if (p.y() < minY) + if (p.y() < minY) { minY = p.y(); vIntersections.clear(); vIntersections.append(p); } - else + else if (VFuzzyComparePossibleNulls(p.y(), minY)) { vIntersections.append(p); } @@ -215,11 +211,7 @@ QPointF VToolPointOfIntersectionCurves::FindPoint(const QVector &curve1 vIntersections.clear(); vIntersections.append(p); } - else if (p.y() < maxY) - { - continue; - } - else + else if (VFuzzyComparePossibleNulls(p.y(), maxY)) { vIntersections.append(p); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index 43642ff50..f6d504703 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -169,7 +169,7 @@ VToolTriangle* VToolTriangle::Create(const quint32 _id, const QString &pointName if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Triangle, doc); + VAbstractTool::AddRecord(id, Tool::Triangle, doc); VToolTriangle *point = new VToolTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, secondPointId, typeCreation); scene->addItem(point); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index d5c9ff03b..0e8cdb8d9 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -168,7 +168,7 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con if (parse == Document::FullParse) { - VDrawTool::AddRecord(id, Tool::Line, doc); + VAbstractTool::AddRecord(id, Tool::Line, doc); VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeLine, lineColor, typeCreation); scene->addItem(line); InitDrawToolConnections(scene, line); @@ -189,7 +189,7 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con //--------------------------------------------------------------------------------------------------------------------- QString VToolLine::getTagName() const { - return VAbstractPattern::TagLine; + return VDomDocument::TagLine; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 76af85a50..2e8ec0d32 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -1065,7 +1065,7 @@ void VToolSeamAllowance::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_UNUSED(e); return;//Leave this method immediately!!! } - return; //Leave this method immediately after call!!! + //Leave this method immediately after call!!! } } diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index fd9d14b6a..274b6702a 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -1529,7 +1529,6 @@ void VToolUnionDetails::AddToModeling(const QDomElement &domElement) else { qCCritical(vToolUnion, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling)); - return; } } diff --git a/src/libs/vtools/undocommands/adddetnode.cpp b/src/libs/vtools/undocommands/adddetnode.cpp index 5895583d5..122ebf43c 100644 --- a/src/libs/vtools/undocommands/adddetnode.cpp +++ b/src/libs/vtools/undocommands/adddetnode.cpp @@ -61,19 +61,16 @@ void AddDetNode::undo() if (modeling.removeChild(domElement).isNull()) { qCDebug(vUndo, "Can't delete node."); - return; } } else { qCDebug(vUndo, "Can't get node by id = %u.", nodeId); - return; } } else { qCDebug(vUndo, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling)); - return; } } @@ -90,7 +87,6 @@ void AddDetNode::redo() else { qCDebug(vUndo, "Can't find tag %s.", qUtf8Printable(VAbstractPattern::TagModeling)); - return; } } diff --git a/src/libs/vtools/undocommands/deletepiece.cpp b/src/libs/vtools/undocommands/deletepiece.cpp index 0aad0cb3e..7fae76016 100644 --- a/src/libs/vtools/undocommands/deletepiece.cpp +++ b/src/libs/vtools/undocommands/deletepiece.cpp @@ -63,13 +63,12 @@ DeletePiece::DeletePiece(VAbstractPattern *doc, quint32 id, const VPiece &detail else { // Better save id of previous detail instead of reference to node. - m_siblingId = doc->GetParametrUInt(previousDetail.toElement(), VAbstractPattern::AttrId, NULL_ID_STR); + m_siblingId = doc->GetParametrUInt(previousDetail.toElement(), VDomDocument::AttrId, NULL_ID_STR); } } else { qCDebug(vUndo, "Can't get detail by id = %u.", nodeId); - return; } } @@ -111,6 +110,5 @@ void DeletePiece::redo() else { qCDebug(vUndo, "Can't get detail by id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.cpp b/src/libs/vtools/undocommands/label/movedoublelabel.cpp index 88fc9ea13..8a3a4d505 100644 --- a/src/libs/vtools/undocommands/label/movedoublelabel.cpp +++ b/src/libs/vtools/undocommands/label/movedoublelabel.cpp @@ -77,7 +77,6 @@ MoveDoubleLabel::MoveDoubleLabel(VAbstractPattern *doc, const double &x, const d else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } @@ -151,6 +150,5 @@ void MoveDoubleLabel::Do(double mx, double my) else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/label/movelabel.cpp b/src/libs/vtools/undocommands/label/movelabel.cpp index b344498c6..006ce5a87 100644 --- a/src/libs/vtools/undocommands/label/movelabel.cpp +++ b/src/libs/vtools/undocommands/label/movelabel.cpp @@ -56,7 +56,6 @@ MoveLabel::MoveLabel(VAbstractPattern *doc, const double &x, const double &y, co else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } @@ -104,6 +103,5 @@ void MoveLabel::Do(double mx, double my) else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/label/operationmovelabel.cpp b/src/libs/vtools/undocommands/label/operationmovelabel.cpp index e3c67734e..8bdd50f27 100644 --- a/src/libs/vtools/undocommands/label/operationmovelabel.cpp +++ b/src/libs/vtools/undocommands/label/operationmovelabel.cpp @@ -62,7 +62,6 @@ OperationMoveLabel::OperationMoveLabel(quint32 idTool, VAbstractPattern *doc, do else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } @@ -111,7 +110,6 @@ void OperationMoveLabel::Do(double mx, double my) else { qCDebug(vUndo, "Can't find point with id = %u.", nodeId); - return; } } @@ -126,7 +124,7 @@ QDomElement OperationMoveLabel::GetDestinationObject(quint32 idTool, quint32 idP for (qint32 i = 0; i < nodeList.size(); ++i) { const QDomElement dest = nodeList.at(i).toElement(); - if (not dest.isNull() && dest.isElement() && dest.tagName() == VToolRotation::TagDestination) + if (not dest.isNull() && dest.isElement() && dest.tagName() == VAbstractOperation::TagDestination) { correctDest = dest; break; diff --git a/src/libs/vtools/undocommands/movepiece.cpp b/src/libs/vtools/undocommands/movepiece.cpp index 961dc787b..dc515ce27 100644 --- a/src/libs/vtools/undocommands/movepiece.cpp +++ b/src/libs/vtools/undocommands/movepiece.cpp @@ -61,7 +61,6 @@ MovePiece::MovePiece(VAbstractPattern *doc, const double &x, const double &y, co else { qCDebug(vUndo, "Can't find detail with id = %u.", nodeId); - return; } } @@ -84,7 +83,6 @@ void MovePiece::undo() else { qCDebug(vUndo, "Can't find detail with id = %u.", nodeId); - return; } } @@ -111,7 +109,6 @@ void MovePiece::redo() else { qCDebug(vUndo, "Can't find detail with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/movespline.cpp b/src/libs/vtools/undocommands/movespline.cpp index 5a9eb0032..c22830e1a 100644 --- a/src/libs/vtools/undocommands/movespline.cpp +++ b/src/libs/vtools/undocommands/movespline.cpp @@ -116,6 +116,5 @@ void MoveSpline::Do(const VSpline &spl) else { qCDebug(vUndo, "Can't find spline with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp index d418fcc7c..b98c495b8 100644 --- a/src/libs/vtools/undocommands/movesplinepath.cpp +++ b/src/libs/vtools/undocommands/movesplinepath.cpp @@ -110,6 +110,5 @@ void MoveSplinePath::Do(const VSplinePath &splPath) else { qCDebug(vUndo, "Can't find spline path with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/movespoint.cpp b/src/libs/vtools/undocommands/movespoint.cpp index 61635229c..66a2711f3 100644 --- a/src/libs/vtools/undocommands/movespoint.cpp +++ b/src/libs/vtools/undocommands/movespoint.cpp @@ -62,7 +62,6 @@ MoveSPoint::MoveSPoint(VAbstractPattern *doc, const double &x, const double &y, else { qCDebug(vUndo, "Can't find spoint with id = %u.", nodeId); - return; } } @@ -131,6 +130,5 @@ void MoveSPoint::Do(double x, double y) else { qCDebug(vUndo, "Can't find spoint with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/savepieceoptions.cpp b/src/libs/vtools/undocommands/savepieceoptions.cpp index 7f6aa2400..227e7dfbd 100644 --- a/src/libs/vtools/undocommands/savepieceoptions.cpp +++ b/src/libs/vtools/undocommands/savepieceoptions.cpp @@ -86,7 +86,6 @@ void SavePieceOptions::undo() else { qCDebug(vUndo, "Can't find detail with id = %u.", nodeId); - return; } } @@ -118,7 +117,6 @@ void SavePieceOptions::redo() else { qCDebug(vUndo, "Can't find detail with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/savepiecepathoptions.cpp b/src/libs/vtools/undocommands/savepiecepathoptions.cpp index f9c26e785..0d245042f 100644 --- a/src/libs/vtools/undocommands/savepiecepathoptions.cpp +++ b/src/libs/vtools/undocommands/savepiecepathoptions.cpp @@ -73,7 +73,6 @@ void SavePiecePathOptions::undo() else { qCDebug(vUndo, "Can't find path with id = %u.", nodeId); - return; } } @@ -97,7 +96,6 @@ void SavePiecePathOptions::redo() else { qCDebug(vUndo, "Can't find path with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp index e5ed2a76b..a93601256 100644 --- a/src/libs/vtools/undocommands/savetooloptions.cpp +++ b/src/libs/vtools/undocommands/savetooloptions.cpp @@ -63,7 +63,6 @@ void SaveToolOptions::undo() else { qCDebug(vUndo, "Can't find tool with id = %u.", nodeId); - return; } } @@ -82,7 +81,6 @@ void SaveToolOptions::redo() else { qCDebug(vUndo, "Can't find tool with id = %u.", nodeId); - return; } } diff --git a/src/libs/vtools/undocommands/togglepieceinlayout.cpp b/src/libs/vtools/undocommands/togglepieceinlayout.cpp index 9f88e566f..0052c3bbc 100644 --- a/src/libs/vtools/undocommands/togglepieceinlayout.cpp +++ b/src/libs/vtools/undocommands/togglepieceinlayout.cpp @@ -121,6 +121,5 @@ void TogglePieceInLayout::Do(bool state) else { qDebug("Can't get detail by id = %u.", m_id); - return; } } diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.cpp b/src/libs/vtools/visualization/line/vistoollineintersect.cpp index cf59b933d..a58ca54b4 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersect.cpp +++ b/src/libs/vtools/visualization/line/vistoollineintersect.cpp @@ -75,11 +75,7 @@ void VisToolLineIntersect::RefreshGeometry() DrawLine(line1, QLineF(static_cast(*first), static_cast(*second)), supportColor); - if (line2P1Id <= NULL_ID) - { - return; - } - else + if (line2P1Id > NULL_ID) { const QSharedPointer third = Visualization::data->GeometricObject(line2P1Id); DrawPoint(line2P1, static_cast(*third), supportColor); diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp index 650d8fe41..2d0dde07e 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp @@ -73,11 +73,7 @@ void VisToolPointOfContact::RefreshGeometry() DrawPoint(lineP2, static_cast(*second), supportColor); DrawLine(this, QLineF(static_cast(*first), static_cast(*second)), supportColor); - if (radiusId <= NULL_ID) - { - return; - } - else + if (radiusId > NULL_ID) { const QSharedPointer third = Visualization::data->GeometricObject(radiusId); DrawPoint(arc_point, static_cast(*third), supportColor); diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp index 0bc70d787..954cb3b29 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -81,11 +81,7 @@ void VisToolTriangle::RefreshGeometry() DrawAimedAxis(axis, QLineF(static_cast(*first), static_cast(*second)), supportColor); - if (hypotenuseP1Id <= NULL_ID) - { - return; - } - else + if (hypotenuseP1Id > NULL_ID) { const QSharedPointer third = Visualization::data->GeometricObject(hypotenuseP1Id); DrawPoint(hypotenuseP1, static_cast(*third), supportColor); diff --git a/src/libs/vwidgets/vgrainlineitem.cpp b/src/libs/vwidgets/vgrainlineitem.cpp index 970aab0af..c3b4f92d0 100644 --- a/src/libs/vwidgets/vgrainlineitem.cpp +++ b/src/libs/vwidgets/vgrainlineitem.cpp @@ -345,7 +345,6 @@ void VGrainlineItem::mousePressEvent(QGraphicsSceneMouseEvent* pME) else { pME->ignore(); - return; } } } diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index 52d759e22..4350e3553 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -213,7 +213,7 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event) { QWheelEvent* wheel_event = static_cast(event); SCASSERT(wheel_event != nullptr) - if (QApplication::keyboardModifiers() == _modifiers) + if (QGuiApplication::keyboardModifiers() == _modifiers) { if (wheel_event->orientation() == Qt::Vertical) { @@ -225,7 +225,7 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event) } else { - if (QApplication::keyboardModifiers() == Qt::ShiftModifier) + if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier) { return StartHorizontalScrollings(wheel_event); } diff --git a/src/libs/vwidgets/vtextgraphicsitem.cpp b/src/libs/vwidgets/vtextgraphicsitem.cpp index ce28ee4d6..567a3a68c 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.cpp +++ b/src/libs/vwidgets/vtextgraphicsitem.cpp @@ -453,7 +453,6 @@ void VTextGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *pME) else { pME->ignore(); - return; } } }