From 2b039d67feb51dafc5c19db9f1b29e7aa6dc6bda Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 25 Jul 2022 08:31:18 +0200 Subject: [PATCH] Part: Fix several clazy issues: * Maybe you meant to call Primitive::onChanged() instead [-Wclazy-skipped-base-method] * Maybe you meant to call Primitive::mustExecute() instead [-Wclazy-skipped-base-method] * Missing reference in range-for with non trivial type [-Wclazy-range-loop-reference] * Use multi-arg instead [-Wclazy-qstring-arg] * Use midRef() instead [-Wclazy-qstring-ref] --- .../Part/App/BRepOffsetAPI_MakeOffsetFix.cpp | 2 +- src/Mod/Part/App/FeaturePartCircle.cpp | 4 +- src/Mod/Part/App/Geometry.cpp | 12 +- src/Mod/Part/Gui/Command.cpp | 8 +- src/Mod/Part/Gui/CrossSections.cpp | 8 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 10 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 443 +++++++++--------- src/Mod/Part/Gui/DlgProjectionOnSurface.cpp | 26 +- src/Mod/Part/Gui/DlgRevolution.cpp | 12 +- src/Mod/Part/Gui/Mirroring.cpp | 2 +- src/Mod/Part/Gui/ReferenceHighlighter.cpp | 6 +- src/Mod/Part/Gui/TaskLoft.cpp | 2 +- src/Mod/Part/Gui/TaskShapeBuilder.cpp | 2 +- src/Mod/Part/Gui/TaskSweep.cpp | 10 +- src/Mod/Part/Gui/ViewProviderCurveNet.cpp | 4 +- 15 files changed, 275 insertions(+), 276 deletions(-) diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp index 85273198ba..cac9a64785 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp +++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp @@ -136,7 +136,7 @@ void BRepOffsetAPI_MakeOffsetFix::MakeWire(TopoDS_Shape& wire) } std::list edgeList; - for (auto itLoc : myLocations) { + for (const auto& itLoc : myLocations) { TopTools_ListOfShape newShapes = mkOffset.Generated(itLoc.first); // Check generated shapes for the vertexes, too TopExp_Explorer xpv(itLoc.first, TopAbs_VERTEX); diff --git a/src/Mod/Part/App/FeaturePartCircle.cpp b/src/Mod/Part/App/FeaturePartCircle.cpp index db55127be5..b2f23dc648 100644 --- a/src/Mod/Part/App/FeaturePartCircle.cpp +++ b/src/Mod/Part/App/FeaturePartCircle.cpp @@ -58,7 +58,7 @@ short Circle::mustExecute() const Angle2.isTouched() || Radius.isTouched()) return 1; - return Part::Feature::mustExecute(); + return Part::Primitive::mustExecute(); } App::DocumentObjectExecReturn *Circle::execute(void) @@ -85,7 +85,7 @@ void Circle::onChanged(const App::Property* prop) } } } - Part::Feature::onChanged(prop); + Part::Feature::onChanged(prop); // clazy:exclude=skipped-base-method } void Circle::Restore(Base::XMLReader &reader) diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index b9728251dd..6e348aec08 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -208,7 +208,7 @@ void Geometry::Save(Base::Writer &writer) const // Get the number of persistent extensions int counter = 0; - for(auto att:extensions) { + for(const auto& att : extensions) { if(att->isDerivedFrom(Part::GeometryPersistenceExtension::getClassTypeId())) counter++; } @@ -217,7 +217,7 @@ void Geometry::Save(Base::Writer &writer) const writer.incInd(); - for(auto att:extensions) { + for(const auto& att : extensions) { if(att->isDerivedFrom(Part::GeometryPersistenceExtension::getClassTypeId())) std::static_pointer_cast(att)->Save(writer); } @@ -282,7 +282,7 @@ std::vector> Geometry::getExtensions() co bool Geometry::hasExtension(Base::Type type) const { - for( auto ext : extensions) { + for(const auto& ext : extensions) { if(ext->getTypeId() == type) return true; } @@ -292,7 +292,7 @@ bool Geometry::hasExtension(Base::Type type) const bool Geometry::hasExtension(const std::string & name) const { - for( auto ext : extensions) { + for(const auto& ext : extensions) { if(ext->getName() == name) return true; } @@ -302,7 +302,7 @@ bool Geometry::hasExtension(const std::string & name) const std::weak_ptr Geometry::getExtension(Base::Type type) { - for( auto ext : extensions) { + for(const auto& ext : extensions) { if(ext->getTypeId() == type) return ext; } @@ -312,7 +312,7 @@ std::weak_ptr Geometry::getExtension(Base::Type type) std::weak_ptr Geometry::getExtension(const std::string & name) { - for( auto ext : extensions) { + for(const auto& ext : extensions) { if(ext->getName() == name) return ext; } diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index d6ee2f9e14..69d7ff4389 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -1202,8 +1202,8 @@ void CmdPartMakeSolid::activated(int iMsg) "__o__.Shape=__s__\n" "del __s__, __o__" ) - .arg(QLatin1String((*it)->getNameInDocument())) - .arg(QLatin1String((*it)->Label.getValue())); + .arg(QLatin1String((*it)->getNameInDocument()), + QLatin1String((*it)->Label.getValue())); } else if (type == TopAbs_SHELL) { str = QString::fromLatin1( @@ -1214,8 +1214,8 @@ void CmdPartMakeSolid::activated(int iMsg) "__o__.Shape=__s__\n" "del __s__, __o__" ) - .arg(QLatin1String((*it)->getNameInDocument())) - .arg(QLatin1String((*it)->Label.getValue())); + .arg(QLatin1String((*it)->getNameInDocument()), + QLatin1String((*it)->Label.getValue())); } else { Base::Console().Message("%s is ignored because it is neither a shell nor a compound.\n", diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index c31f2b458a..4b46ae1816 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -260,8 +260,8 @@ void CrossSections::apply() Gui::Command::runCommand(Gui::Command::App, QString::fromLatin1( "wires=list()\n" "shape=FreeCAD.getDocument(\"%1\").%2.Shape\n") - .arg(QLatin1String(doc->getName())) - .arg(QLatin1String((*it)->getNameInDocument())).toLatin1()); + .arg(QLatin1String(doc->getName()), + QLatin1String((*it)->getNameInDocument())).toLatin1()); for (std::vector::iterator jt = d.begin(); jt != d.end(); ++jt) { Gui::Command::runCommand(Gui::Command::App, QString::fromLatin1( @@ -277,8 +277,8 @@ void CrossSections::apply() "slice.Shape=comp\n" "slice.purgeTouched()\n" "del slice,comp,wires,shape") - .arg(QLatin1String(doc->getName())) - .arg(QLatin1String(s.c_str())).toLatin1()); + .arg(QLatin1String(doc->getName()), + QLatin1String(s.c_str())).toLatin1()); seq.next(); } diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 06bfc7f55f..2e2b3c0dc1 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -131,7 +131,7 @@ FilletRadiusModel::FilletRadiusModel(QObject * parent) : QStandardItemModel(pare void FilletRadiusModel::updateCheckStates() { // See http://www.qtcentre.org/threads/18856-Checkboxes-in-Treeview-do-not-get-refreshed?s=b0fea2bfc66da1098413ae9f2a651a68&p=93201#post93201 - /*emit*/ layoutChanged(); + Q_EMIT layoutChanged(); } Qt::ItemFlags FilletRadiusModel::flags (const QModelIndex & index) const @@ -146,7 +146,7 @@ bool FilletRadiusModel::setData (const QModelIndex & index, const QVariant & val { bool ok = QStandardItemModel::setData(index, value, role); if (role == Qt::CheckStateRole) { - toggleCheckState(index); + Q_EMIT toggleCheckState(index); } return ok; } @@ -431,7 +431,7 @@ void DlgFilletEdges::onSelectEdge(const QString& subelement, int type) void DlgFilletEdges::onSelectEdgesOfFace(const QString& subelement, int type) { bool ok; - int index = subelement.mid(4).toInt(&ok); + int index = subelement.midRef(4).toInt(&ok); if (ok) { try { const TopoDS_Shape& face = d->all_faces.FindKey(index); @@ -914,7 +914,7 @@ bool DlgFilletEdges::accept() code = QString::fromLatin1( "FreeCAD.ActiveDocument.addObject(\"%1\",\"%2\")\n" "FreeCAD.ActiveDocument.%2.Base = FreeCAD.ActiveDocument.%3\n") - .arg(type).arg(name).arg(shape); + .arg(type, name, shape); } code += QString::fromLatin1("__fillets__ = []\n"); for (int i=0; irowCount(); ++i) { @@ -950,7 +950,7 @@ bool DlgFilletEdges::accept() "FreeCAD.ActiveDocument.%1.Edges = __fillets__\n" "del __fillets__\n" "FreeCADGui.ActiveDocument.%2.Visibility = False\n") - .arg(name).arg(shape); + .arg(name, shape); Gui::Command::runCommand(Gui::Command::App, code.toLatin1()); activeDoc->commitTransaction(); activeDoc->recompute(); diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index b94b33aa15..c4f97c400f 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -71,8 +71,7 @@ namespace PartGui { QString activeObjectName = QString::fromLatin1(activePart->getNameInDocument()); return QString::fromLatin1("App.ActiveDocument.getObject('%1\')." "addObject(App.ActiveDocument.getObject('%2\'))\n") - .arg(activeObjectName) - .arg(objectName); + .arg(activeObjectName, objectName); } return QString::fromLatin1("# Object %1 created at document root").arg(objectName); } @@ -733,11 +732,11 @@ QString DlgPrimitives::createPlane(const QString& objectName, const QString& pla "App.ActiveDocument.%1.Width=%3\n" "App.ActiveDocument.%1.Placement=%4\n" "App.ActiveDocument.%1.Label='%5'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->planeLength->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->planeWidth->value(), format)) - .arg(placement) - .arg(tr("Plane")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->planeLength->value(), format), + Base::UnitsApi::toNumber(ui->planeWidth->value(), format), + placement, + tr("Plane")); } QString DlgPrimitives::createBox(const QString& objectName, const QString& placement) const @@ -750,12 +749,12 @@ QString DlgPrimitives::createBox(const QString& objectName, const QString& place "App.ActiveDocument.%1.Height=%4\n" "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->boxLength->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->boxWidth->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->boxHeight->value(), format)) - .arg(placement) - .arg(tr("Box")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->boxLength->value(), format), + Base::UnitsApi::toNumber(ui->boxWidth->value(), format), + Base::UnitsApi::toNumber(ui->boxHeight->value(), format), + placement, + tr("Box")); } QString DlgPrimitives::createCylinder(const QString& objectName, const QString& placement) const @@ -770,14 +769,14 @@ QString DlgPrimitives::createCylinder(const QString& objectName, const QString& "App.ActiveDocument.%1.SecondAngle=%6\n" "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->cylinderRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->cylinderHeight->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->cylinderAngle->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->cylinderXSkew->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->cylinderYSkew->value(), format)) - .arg(placement) - .arg(tr("Cylinder")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->cylinderRadius->value(), format), + Base::UnitsApi::toNumber(ui->cylinderHeight->value(), format), + Base::UnitsApi::toNumber(ui->cylinderAngle->value(), format), + Base::UnitsApi::toNumber(ui->cylinderXSkew->value(), format), + Base::UnitsApi::toNumber(ui->cylinderYSkew->value(), format), + placement, + tr("Cylinder")); } QString DlgPrimitives::createCone(const QString& objectName, const QString& placement) const @@ -791,13 +790,13 @@ QString DlgPrimitives::createCone(const QString& objectName, const QString& plac "App.ActiveDocument.%1.Angle=%5\n" "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->coneRadius1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->coneRadius2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->coneHeight->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->coneAngle->value(), format)) - .arg(placement) - .arg(tr("Cone")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->coneRadius1->value(), format), + Base::UnitsApi::toNumber(ui->coneRadius2->value(), format), + Base::UnitsApi::toNumber(ui->coneHeight->value(), format), + Base::UnitsApi::toNumber(ui->coneAngle->value(), format), + placement, + tr("Cone")); } QString DlgPrimitives::createSphere(const QString& objectName, const QString& placement) const @@ -811,13 +810,13 @@ QString DlgPrimitives::createSphere(const QString& objectName, const QString& pl "App.ActiveDocument.%1.Angle3=%5\n" "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->sphereRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle3->value(), format)) - .arg(placement) - .arg(tr("Sphere")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->sphereRadius->value(), format), + Base::UnitsApi::toNumber(ui->sphereAngle1->value(), format), + Base::UnitsApi::toNumber(ui->sphereAngle2->value(), format), + Base::UnitsApi::toNumber(ui->sphereAngle3->value(), format), + placement, + tr("Sphere")); } QString DlgPrimitives::createEllipsoid(const QString& objectName, const QString& placement) const @@ -833,15 +832,15 @@ QString DlgPrimitives::createEllipsoid(const QString& objectName, const QString& "App.ActiveDocument.%1.Angle3=%7\n" "App.ActiveDocument.%1.Placement=%8\n" "App.ActiveDocument.%1.Label='%9'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius3->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle3->value(), format)) - .arg(placement) - .arg(tr("Ellipsoid")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value(), format), + Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value(), format), + Base::UnitsApi::toNumber(ui->ellipsoidRadius3->value(), format), + Base::UnitsApi::toNumber(ui->ellipsoidAngle1->value(), format), + Base::UnitsApi::toNumber(ui->ellipsoidAngle2->value(), format), + Base::UnitsApi::toNumber(ui->ellipsoidAngle3->value(), format), + placement, + tr("Ellipsoid")); } QString DlgPrimitives::createTorus(const QString& objectName, const QString& placement) const @@ -856,14 +855,14 @@ QString DlgPrimitives::createTorus(const QString& objectName, const QString& pla "App.ActiveDocument.%1.Angle3=%6\n" "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->torusRadius1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->torusRadius2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->torusAngle1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->torusAngle2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->torusAngle3->value(), format)) - .arg(placement) - .arg(tr("Torus")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->torusRadius1->value(), format), + Base::UnitsApi::toNumber(ui->torusRadius2->value(), format), + Base::UnitsApi::toNumber(ui->torusAngle1->value(), format), + Base::UnitsApi::toNumber(ui->torusAngle2->value(), format), + Base::UnitsApi::toNumber(ui->torusAngle3->value(), format), + placement, + tr("Torus")); } QString DlgPrimitives::createPrism(const QString& objectName, const QString& placement) const @@ -878,14 +877,14 @@ QString DlgPrimitives::createPrism(const QString& objectName, const QString& pla "App.ActiveDocument.%1.SecondAngle=%6\n" "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") - .arg(objectName) - .arg(ui->prismPolygon->value()) - .arg(Base::UnitsApi::toNumber(ui->prismCircumradius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->prismHeight->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->prismXSkew->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->prismYSkew->value(), format)) - .arg(placement) - .arg(tr("Prism")); + .arg(objectName, + QString::number(ui->prismPolygon->value()), + Base::UnitsApi::toNumber(ui->prismCircumradius->value(), format), + Base::UnitsApi::toNumber(ui->prismHeight->value(), format), + Base::UnitsApi::toNumber(ui->prismXSkew->value(), format), + Base::UnitsApi::toNumber(ui->prismYSkew->value(), format), + placement, + tr("Prism")); } QString DlgPrimitives::createWedge(const QString& objectName, const QString& placement) const @@ -905,19 +904,19 @@ QString DlgPrimitives::createWedge(const QString& objectName, const QString& pla "App.ActiveDocument.%1.Z2max=%11\n" "App.ActiveDocument.%1.Placement=%12\n" "App.ActiveDocument.%1.Label='%13'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->wedgeXmin->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeYmin->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeZmin->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeX2min->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeZ2min->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeXmax->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeYmax->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeZmax->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeX2max->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->wedgeZ2max->value(), format)) - .arg(placement) - .arg(tr("Wedge")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->wedgeXmin->value(), format), + Base::UnitsApi::toNumber(ui->wedgeYmin->value(), format), + Base::UnitsApi::toNumber(ui->wedgeZmin->value(), format), + Base::UnitsApi::toNumber(ui->wedgeX2min->value(), format), + Base::UnitsApi::toNumber(ui->wedgeZ2min->value(), format), + Base::UnitsApi::toNumber(ui->wedgeXmax->value(), format), + Base::UnitsApi::toNumber(ui->wedgeYmax->value(), format)) + .arg(Base::UnitsApi::toNumber(ui->wedgeZmax->value(), format), + Base::UnitsApi::toNumber(ui->wedgeX2max->value(), format), + Base::UnitsApi::toNumber(ui->wedgeZ2max->value(), format), + placement, + tr("Wedge")); } QString DlgPrimitives::createHelix(const QString& objectName, const QString& placement) const @@ -933,14 +932,14 @@ QString DlgPrimitives::createHelix(const QString& objectName, const QString& pla "App.ActiveDocument.%1.Style=1\n" "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->helixPitch->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->helixHeight->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->helixRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->helixAngle->value(), format)) - .arg(ui->helixLocalCS->currentIndex()) - .arg(placement) - .arg(tr("Helix")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->helixPitch->value(), format), + Base::UnitsApi::toNumber(ui->helixHeight->value(), format), + Base::UnitsApi::toNumber(ui->helixRadius->value(), format), + Base::UnitsApi::toNumber(ui->helixAngle->value(), format), + QString::number(ui->helixLocalCS->currentIndex()), + placement, + tr("Helix")); } QString DlgPrimitives::createSpiral(const QString& objectName, const QString& placement) const @@ -953,12 +952,12 @@ QString DlgPrimitives::createSpiral(const QString& objectName, const QString& pl "App.ActiveDocument.%1.Radius=%4\n" "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->spiralGrowth->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->spiralRotation->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->spiralRadius->value(), format)) - .arg(placement) - .arg(tr("Spiral")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->spiralGrowth->value(), format), + Base::UnitsApi::toNumber(ui->spiralRotation->value(), format), + Base::UnitsApi::toNumber(ui->spiralRadius->value(), format), + placement, + tr("Spiral")); } QString DlgPrimitives::createCircle(const QString& objectName, const QString& placement) const @@ -971,12 +970,12 @@ QString DlgPrimitives::createCircle(const QString& objectName, const QString& pl "App.ActiveDocument.%1.Angle2=%4\n" "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->circleRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->circleAngle1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->circleAngle2->value(), format)) - .arg(placement) - .arg(tr("Circle")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->circleRadius->value(), format), + Base::UnitsApi::toNumber(ui->circleAngle1->value(), format), + Base::UnitsApi::toNumber(ui->circleAngle2->value(), format), + placement, + tr("Circle")); } QString DlgPrimitives::createEllipse(const QString& objectName, const QString& placement) const @@ -990,13 +989,13 @@ QString DlgPrimitives::createEllipse(const QString& objectName, const QString& p "App.ActiveDocument.%1.Angle2=%5\n" "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle2->value(), format)) - .arg(placement) - .arg(tr("Ellipse")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value(), format), + Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value(), format), + Base::UnitsApi::toNumber(ui->ellipseAngle1->value(), format), + Base::UnitsApi::toNumber(ui->ellipseAngle2->value(), format), + placement, + tr("Ellipse")); } QString DlgPrimitives::createVertex(const QString& objectName, const QString& placement) const @@ -1009,12 +1008,12 @@ QString DlgPrimitives::createVertex(const QString& objectName, const QString& pl "App.ActiveDocument.%1.Z=%4\n" "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->vertexX->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->vertexY->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->vertexZ->value(), format)) - .arg(placement) - .arg(tr("Vertex")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->vertexX->value(), format), + Base::UnitsApi::toNumber(ui->vertexY->value(), format), + Base::UnitsApi::toNumber(ui->vertexZ->value(), format), + placement, + tr("Vertex")); } QString DlgPrimitives::createLine(const QString& objectName, const QString& placement) const @@ -1030,15 +1029,15 @@ QString DlgPrimitives::createLine(const QString& objectName, const QString& plac "App.ActiveDocument.%1.Z2=%7\n" "App.ActiveDocument.%1.Placement=%8\n" "App.ActiveDocument.%1.Label='%9'\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->edgeX1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->edgeY1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->edgeZ1->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->edgeX2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->edgeY2->value(), format)) - .arg(Base::UnitsApi::toNumber(ui->edgeZ2->value(), format)) - .arg(placement) - .arg(tr("Line")); + .arg(objectName, + Base::UnitsApi::toNumber(ui->edgeX1->value(), format), + Base::UnitsApi::toNumber(ui->edgeY1->value(), format), + Base::UnitsApi::toNumber(ui->edgeZ1->value(), format), + Base::UnitsApi::toNumber(ui->edgeX2->value(), format), + Base::UnitsApi::toNumber(ui->edgeY2->value(), format), + Base::UnitsApi::toNumber(ui->edgeZ2->value(), format), + placement, + tr("Line")); } QString DlgPrimitives::createRegularPolygon(const QString& objectName, const QString& placement) const @@ -1050,11 +1049,11 @@ QString DlgPrimitives::createRegularPolygon(const QString& objectName, const QSt "App.ActiveDocument.%1.Circumradius=%3\n" "App.ActiveDocument.%1.Placement=%4\n" "App.ActiveDocument.%1.Label='%5'\n") - .arg(objectName) - .arg(ui->regularPolygonPolygon->value()) - .arg(Base::UnitsApi::toNumber(ui->regularPolygonCircumradius->value(), format)) - .arg(placement) - .arg(tr("Regular polygon")); + .arg(objectName, + QString::number(ui->regularPolygonPolygon->value()), + Base::UnitsApi::toNumber(ui->regularPolygonCircumradius->value(), format), + placement, + tr("Regular polygon")); } void DlgPrimitives::createPrimitive(const QString& placement) @@ -1153,10 +1152,10 @@ QString DlgPrimitives::changePlane(const QString& objectName, const QString& pla "%1.Length=%2\n" "%1.Width=%3\n" "%1.Placement=%4\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->planeLength->value())) - .arg(Base::UnitsApi::toNumber(ui->planeWidth->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->planeLength->value()), + Base::UnitsApi::toNumber(ui->planeWidth->value()), + placement); } QString DlgPrimitives::changeBox(const QString& objectName, const QString& placement) const @@ -1166,11 +1165,11 @@ QString DlgPrimitives::changeBox(const QString& objectName, const QString& place "%1.Width=%3\n" "%1.Height=%4\n" "%1.Placement=%5\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->boxLength->value())) - .arg(Base::UnitsApi::toNumber(ui->boxWidth->value())) - .arg(Base::UnitsApi::toNumber(ui->boxHeight->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->boxLength->value()), + Base::UnitsApi::toNumber(ui->boxWidth->value()), + Base::UnitsApi::toNumber(ui->boxHeight->value()), + placement); } QString DlgPrimitives::changeCylinder(const QString& objectName, const QString& placement) const @@ -1180,11 +1179,11 @@ QString DlgPrimitives::changeCylinder(const QString& objectName, const QString& "%1.Height=%3\n" "%1.Angle=%4\n" "%1.Placement=%5\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->cylinderRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->cylinderHeight->value())) - .arg(Base::UnitsApi::toNumber(ui->cylinderAngle->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->cylinderRadius->value()), + Base::UnitsApi::toNumber(ui->cylinderHeight->value()), + Base::UnitsApi::toNumber(ui->cylinderAngle->value()), + placement); } QString DlgPrimitives::changeCone(const QString& objectName, const QString& placement) const @@ -1195,12 +1194,12 @@ QString DlgPrimitives::changeCone(const QString& objectName, const QString& plac "%1.Height=%4\n" "%1.Angle=%5\n" "%1.Placement=%6\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->coneRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->coneRadius2->value())) - .arg(Base::UnitsApi::toNumber(ui->coneHeight->value())) - .arg(Base::UnitsApi::toNumber(ui->coneAngle->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->coneRadius1->value()), + Base::UnitsApi::toNumber(ui->coneRadius2->value()), + Base::UnitsApi::toNumber(ui->coneHeight->value()), + Base::UnitsApi::toNumber(ui->coneAngle->value()), + placement); } QString DlgPrimitives::changeSphere(const QString& objectName, const QString& placement) const @@ -1211,12 +1210,12 @@ QString DlgPrimitives::changeSphere(const QString& objectName, const QString& pl "%1.Angle2=%4\n" "%1.Angle3=%5\n" "%1.Placement=%6\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->sphereRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle1->value())) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle2->value())) - .arg(Base::UnitsApi::toNumber(ui->sphereAngle3->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->sphereRadius->value()), + Base::UnitsApi::toNumber(ui->sphereAngle1->value()), + Base::UnitsApi::toNumber(ui->sphereAngle2->value()), + Base::UnitsApi::toNumber(ui->sphereAngle3->value()), + placement); } QString DlgPrimitives::changeEllipsoid(const QString& objectName, const QString& placement) const @@ -1229,14 +1228,14 @@ QString DlgPrimitives::changeEllipsoid(const QString& objectName, const QString& "%1.Angle2=%6\n" "%1.Angle3=%7\n" "%1.Placement=%8\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidRadius3->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle1->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle2->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipsoidAngle3->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value()), + Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value()), + Base::UnitsApi::toNumber(ui->ellipsoidRadius3->value()), + Base::UnitsApi::toNumber(ui->ellipsoidAngle1->value()), + Base::UnitsApi::toNumber(ui->ellipsoidAngle2->value()), + Base::UnitsApi::toNumber(ui->ellipsoidAngle3->value()), + placement); } QString DlgPrimitives::changeTorus(const QString& objectName, const QString& placement) const @@ -1248,13 +1247,13 @@ QString DlgPrimitives::changeTorus(const QString& objectName, const QString& pla "%1.Angle2=%5\n" "%1.Angle3=%6\n" "%1.Placement=%7\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->torusRadius1->value())) - .arg(Base::UnitsApi::toNumber(ui->torusRadius2->value())) - .arg(Base::UnitsApi::toNumber(ui->torusAngle1->value())) - .arg(Base::UnitsApi::toNumber(ui->torusAngle2->value())) - .arg(Base::UnitsApi::toNumber(ui->torusAngle3->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->torusRadius1->value()), + Base::UnitsApi::toNumber(ui->torusRadius2->value()), + Base::UnitsApi::toNumber(ui->torusAngle1->value()), + Base::UnitsApi::toNumber(ui->torusAngle2->value()), + Base::UnitsApi::toNumber(ui->torusAngle3->value()), + placement); } QString DlgPrimitives::changePrism(const QString& objectName, const QString& placement) const @@ -1266,13 +1265,13 @@ QString DlgPrimitives::changePrism(const QString& objectName, const QString& pla "%1.FirstAngle=%5\n" "%1.SecondAngle=%6\n" "%1.Placement=%7\n") - .arg(objectName) - .arg(ui->prismPolygon->value()) - .arg(Base::UnitsApi::toNumber(ui->prismCircumradius->value())) - .arg(Base::UnitsApi::toNumber(ui->prismHeight->value())) - .arg(Base::UnitsApi::toNumber(ui->prismXSkew->value())) - .arg(Base::UnitsApi::toNumber(ui->prismYSkew->value())) - .arg(placement); + .arg(objectName, + QString::number(ui->prismPolygon->value()), + Base::UnitsApi::toNumber(ui->prismCircumradius->value()), + Base::UnitsApi::toNumber(ui->prismHeight->value()), + Base::UnitsApi::toNumber(ui->prismXSkew->value()), + Base::UnitsApi::toNumber(ui->prismYSkew->value()), + placement); } QString DlgPrimitives::changeWedge(const QString& objectName, const QString& placement) const @@ -1289,18 +1288,18 @@ QString DlgPrimitives::changeWedge(const QString& objectName, const QString& pla "%1.X2max=%10\n" "%1.Z2max=%11\n" "%1.Placement=%12\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->wedgeXmin->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeYmin->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeZmin->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeX2min->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeZ2min->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeXmax->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeYmax->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeZmax->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeX2max->value())) - .arg(Base::UnitsApi::toNumber(ui->wedgeZ2max->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->wedgeXmin->value()), + Base::UnitsApi::toNumber(ui->wedgeYmin->value()), + Base::UnitsApi::toNumber(ui->wedgeZmin->value()), + Base::UnitsApi::toNumber(ui->wedgeX2min->value()), + Base::UnitsApi::toNumber(ui->wedgeZ2min->value()), + Base::UnitsApi::toNumber(ui->wedgeXmax->value()), + Base::UnitsApi::toNumber(ui->wedgeYmax->value()), + Base::UnitsApi::toNumber(ui->wedgeZmax->value())) + .arg(Base::UnitsApi::toNumber(ui->wedgeX2max->value()), + Base::UnitsApi::toNumber(ui->wedgeZ2max->value()), + placement); } QString DlgPrimitives::changeHelix(const QString& objectName, const QString& placement) const @@ -1312,13 +1311,13 @@ QString DlgPrimitives::changeHelix(const QString& objectName, const QString& pla "%1.Angle=%5\n" "%1.LocalCoord=%6\n" "%1.Placement=%7\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->helixPitch->value())) - .arg(Base::UnitsApi::toNumber(ui->helixHeight->value())) - .arg(Base::UnitsApi::toNumber(ui->helixRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->helixAngle->value())) - .arg(ui->helixLocalCS->currentIndex()) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->helixPitch->value()), + Base::UnitsApi::toNumber(ui->helixHeight->value()), + Base::UnitsApi::toNumber(ui->helixRadius->value()), + Base::UnitsApi::toNumber(ui->helixAngle->value()), + QString::number(ui->helixLocalCS->currentIndex()), + placement); } QString DlgPrimitives::changeSpiral(const QString& objectName, const QString& placement) const @@ -1328,11 +1327,11 @@ QString DlgPrimitives::changeSpiral(const QString& objectName, const QString& pl "%1.Rotations=%3\n" "%1.Radius=%4\n" "%1.Placement=%5\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->spiralGrowth->value())) - .arg(Base::UnitsApi::toNumber(ui->spiralRotation->value())) - .arg(Base::UnitsApi::toNumber(ui->spiralRadius->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->spiralGrowth->value()), + Base::UnitsApi::toNumber(ui->spiralRotation->value()), + Base::UnitsApi::toNumber(ui->spiralRadius->value()), + placement); } QString DlgPrimitives::changeCircle(const QString& objectName, const QString& placement) const @@ -1342,11 +1341,11 @@ QString DlgPrimitives::changeCircle(const QString& objectName, const QString& pl "%1.Angle1=%3\n" "%1.Angle2=%4\n" "%1.Placement=%5\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->circleRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->circleAngle1->value())) - .arg(Base::UnitsApi::toNumber(ui->circleAngle2->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->circleRadius->value()), + Base::UnitsApi::toNumber(ui->circleAngle1->value()), + Base::UnitsApi::toNumber(ui->circleAngle2->value()), + placement); } QString DlgPrimitives::changeEllipse(const QString& objectName, const QString& placement) const @@ -1357,12 +1356,12 @@ QString DlgPrimitives::changeEllipse(const QString& objectName, const QString& p "%1.Angle1=%4\n" "%1.Angle2=%5\n" "%1.Placement=%6\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle1->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle2->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value()), + Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value()), + Base::UnitsApi::toNumber(ui->ellipseAngle1->value()), + Base::UnitsApi::toNumber(ui->ellipseAngle2->value()), + placement); } QString DlgPrimitives::changeVertex(const QString& objectName, const QString& placement) const @@ -1372,11 +1371,11 @@ QString DlgPrimitives::changeVertex(const QString& objectName, const QString& pl "%1.Y=%3\n" "%1.Z=%4\n" "%1.Placement=%5\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->vertexX->value())) - .arg(Base::UnitsApi::toNumber(ui->vertexY->value())) - .arg(Base::UnitsApi::toNumber(ui->vertexZ->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->vertexX->value()), + Base::UnitsApi::toNumber(ui->vertexY->value()), + Base::UnitsApi::toNumber(ui->vertexZ->value()), + placement); } QString DlgPrimitives::changeLine(const QString& objectName, const QString& placement) const @@ -1389,14 +1388,14 @@ QString DlgPrimitives::changeLine(const QString& objectName, const QString& plac "%1.Y2=%6\n" "%1.Z2=%7\n" "%1.Placement=%8\n") - .arg(objectName) - .arg(Base::UnitsApi::toNumber(ui->edgeX1->value())) - .arg(Base::UnitsApi::toNumber(ui->edgeY1->value())) - .arg(Base::UnitsApi::toNumber(ui->edgeZ1->value())) - .arg(Base::UnitsApi::toNumber(ui->edgeX2->value())) - .arg(Base::UnitsApi::toNumber(ui->edgeY2->value())) - .arg(Base::UnitsApi::toNumber(ui->edgeZ2->value())) - .arg(placement); + .arg(objectName, + Base::UnitsApi::toNumber(ui->edgeX1->value()), + Base::UnitsApi::toNumber(ui->edgeY1->value()), + Base::UnitsApi::toNumber(ui->edgeZ1->value()), + Base::UnitsApi::toNumber(ui->edgeX2->value()), + Base::UnitsApi::toNumber(ui->edgeY2->value()), + Base::UnitsApi::toNumber(ui->edgeZ2->value()), + placement); } QString DlgPrimitives::changeRegularPolygon(const QString& objectName, const QString& placement) const @@ -1405,10 +1404,10 @@ QString DlgPrimitives::changeRegularPolygon(const QString& objectName, const QSt "%1.Polygon=%2\n" "%1.Circumradius=%3\n" "%1.Placement=%4\n") - .arg(objectName) - .arg(ui->regularPolygonPolygon->value()) - .arg(Base::UnitsApi::toNumber(ui->regularPolygonCircumradius->value())) - .arg(placement); + .arg(objectName, + QString::number(ui->regularPolygonPolygon->value()), + Base::UnitsApi::toNumber(ui->regularPolygonCircumradius->value()), + placement); } void DlgPrimitives::accept(const QString& placement) @@ -1419,8 +1418,8 @@ void DlgPrimitives::accept(const QString& placement) App::Document* doc = featurePtr->getDocument(); Base::Type type = featurePtr->getTypeId(); QString objectName = QString::fromLatin1("App.getDocument(\"%1\").%2") - .arg(QString::fromLatin1(doc->getName())) - .arg(QString::fromLatin1(featurePtr->getNameInDocument())); + .arg(QString::fromLatin1(doc->getName()), + QString::fromLatin1(featurePtr->getNameInDocument())); // read values from the properties if (type == Part::Plane::getClassTypeId()) { diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index 5f56dc00b6..199ba741df 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -188,7 +188,7 @@ DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget *parent) DlgProjectionOnSurface::~DlgProjectionOnSurface() { delete ui; - for ( auto it : m_projectionSurfaceVec) + for (const auto& it : m_projectionSurfaceVec) { try { higlight_object(it.partFeature, it.partName, false, 0); @@ -203,7 +203,7 @@ DlgProjectionOnSurface::~DlgProjectionOnSurface() vp->Transparency.setValue(it.transparency); } } - for (auto it : m_shapeVec) + for (const auto& it : m_shapeVec) { try { higlight_object(it.partFeature, it.partName, false, 0); @@ -475,7 +475,7 @@ void PartGui::DlgProjectionOnSurface::create_projection_wire(std::vector::max(); @@ -534,15 +534,15 @@ TopoDS_Shape PartGui::DlgProjectionOnSurface::create_compound(const std::vector< TopoDS_Builder aBuilder; aBuilder.MakeCompound(aCompound); - for (auto it : iShapeVec) + for (const auto& it : iShapeVec) { if ( m_currentShowType == "edges" ) { - for (auto it2 : it.aProjectedEdgeVec) + for (const auto& it2 : it.aProjectedEdgeVec) { aBuilder.Add(aCompound, it2); } - for (auto it2 : it.aProjectedWireVec) + for (const auto& it2 : it.aProjectedWireVec) { aBuilder.Add(aCompound, it2); } @@ -552,7 +552,7 @@ TopoDS_Shape PartGui::DlgProjectionOnSurface::create_compound(const std::vector< { if (it.aProjectedFace.IsNull()) { - for (auto it2 : it.aProjectedWireVec) + for (const auto& it2 : it.aProjectedWireVec) { if (!it2.IsNull()) { @@ -575,7 +575,7 @@ TopoDS_Shape PartGui::DlgProjectionOnSurface::create_compound(const std::vector< } else if (it.aProjectedWireVec.size()) { - for ( auto itWire : it.aProjectedWireVec ) + for (const auto& itWire : it.aProjectedWireVec ) { if ( itWire.IsNull() ) continue; aBuilder.Add(aCompound, itWire); @@ -583,7 +583,7 @@ TopoDS_Shape PartGui::DlgProjectionOnSurface::create_compound(const std::vector< } else if (it.aProjectedEdgeVec.size()) { - for (auto itEdge : it.aProjectedEdgeVec) + for (const auto& itEdge : it.aProjectedEdgeVec) { if (itEdge.IsNull()) continue; aBuilder.Add(aCompound, itEdge); @@ -731,7 +731,7 @@ void PartGui::DlgProjectionOnSurface::create_projection_face_from_wire(std::vect //create a wire of all edges in parametric space on the surface of the face to projected // --> otherwise BRepBuilderAPI_MakeFace can not make a face from the wire! - for (auto itWireVec : itCurrentShape.aProjectedWireVec) + for (const auto& itWireVec : itCurrentShape.aProjectedWireVec) { std::vector edgeVec; for (TopExp_Explorer aExplorer(itWireVec, TopAbs_EDGE); aExplorer.More(); aExplorer.Next()) @@ -827,7 +827,7 @@ TopoDS_Wire PartGui::DlgProjectionOnSurface::sort_and_heal_wire(const std::vecto Handle(TopTools_HSequenceOfShape) aWireHandle; Handle(TopTools_HSequenceOfShape) aWireWireHandle; - for (auto it : iEdgeVec) + for (const auto& it : iEdgeVec) { shapeList->Append(it); } @@ -903,7 +903,7 @@ void PartGui::DlgProjectionOnSurface::store_wire_in_vector(const SShapeStore& iC } std::vector edgeVec; - for ( auto it : aWireVec ) + for (const auto& it : aWireVec ) { bool edgeExists = false; for (TopExp_Explorer aExplorer(it, TopAbs_EDGE); aExplorer.More(); aExplorer.Next()) @@ -923,7 +923,7 @@ void PartGui::DlgProjectionOnSurface::store_wire_in_vector(const SShapeStore& iC if (indexMap.IsEmpty()) return; - for ( auto it : edgeVec ) + for (const auto& it : edgeVec ) { if ( it.IsSame(iCurrentShape.inputShape)) continue; if (!indexMap.Contains(it)) diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index 08e8aea594..c53a3768ec 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -378,8 +378,8 @@ void DlgRevolution::accept() QString strAxisLink; if (axisLink.getValue()){ strAxisLink = QString::fromLatin1("(App.ActiveDocument.%1, %2)") - .arg(QString::fromLatin1(axisLink.getValue()->getNameInDocument())) - .arg(axisLink.getSubValues().size() == 1 ? + .arg(QString::fromLatin1(axisLink.getValue()->getNameInDocument()), + axisLink.getSubValues().size() == 1 ? QString::fromLatin1("\"%1\"").arg(QString::fromLatin1(axisLink.getSubValues()[0].c_str())) : QString() ); } else { @@ -410,7 +410,7 @@ void DlgRevolution::accept() "FreeCAD.ActiveDocument.%2.AxisLink = %12\n" "FreeCAD.ActiveDocument.%2.Symmetric = %13\n" "FreeCADGui.ActiveDocument.%3.Visibility = False\n") - .arg(type).arg(name).arg(shape) //%1, 2, 3 + .arg(type, name, shape) //%1, 2, 3 .arg(axis.x,0,'f',15) //%4 .arg(axis.y,0,'f',15) //%5 .arg(axis.z,0,'f',15) //%6 @@ -418,9 +418,9 @@ void DlgRevolution::accept() .arg(pos.y, 0,'f',15) //%8 .arg(pos.z, 0,'f',15) //%9 .arg(getAngle(),0,'f',15) //%10 - .arg(solid) //%11 - .arg(strAxisLink) //%12 - .arg(symmetric) //13 + .arg(solid, //%11 + strAxisLink, //%12 + symmetric) //%13 ; Gui::Command::runCommand(Gui::Command::App, code.toLatin1()); QByteArray to = name.toLatin1(); diff --git a/src/Mod/Part/Gui/Mirroring.cpp b/src/Mod/Part/Gui/Mirroring.cpp index cb800e05bb..21eca65fcf 100644 --- a/src/Mod/Part/Gui/Mirroring.cpp +++ b/src/Mod/Part/Gui/Mirroring.cpp @@ -171,7 +171,7 @@ bool Mirroring::accept() "__doc__.ActiveObject.Normal=(%4,%5,%6)\n" "__doc__.ActiveObject.Base=(%7,%8,%9)\n" "del __doc__") - .arg(this->document).arg(shape).arg(label) + .arg(this->document, shape, label) .arg(normx).arg(normy).arg(normz) .arg(basex).arg(basey).arg(basez); Gui::Command::runCommand(Gui::Command::App, code.toLatin1()); diff --git a/src/Mod/Part/Gui/ReferenceHighlighter.cpp b/src/Mod/Part/Gui/ReferenceHighlighter.cpp index c6599094ba..480a57db64 100644 --- a/src/Mod/Part/Gui/ReferenceHighlighter.cpp +++ b/src/Mod/Part/Gui/ReferenceHighlighter.cpp @@ -114,7 +114,7 @@ void ReferenceHighlighter::getVertexColors(const std::vector& eleme colors.resize(vMap.Extent(), defaultColor); if (!elements.empty()) { - for (std::string e : elements) { + for (const std::string& e : elements) { if (boost::starts_with(e, "Vertex")) { getVertexColor(e, colors); } @@ -185,7 +185,7 @@ void ReferenceHighlighter::getEdgeColors(const std::vector& element colors.resize(eMap.Extent(), defaultColor); if (!elements.empty()) { - for (std::string e : elements) { + for (const std::string& e : elements) { if (boost::starts_with(e, "Edge")) { getEdgeColor(e, colors); } @@ -217,7 +217,7 @@ void ReferenceHighlighter::getFaceColors(const std::vector& element colors.resize(fMap.Extent(), defaultColor); if (!elements.empty()) { - for (std::string e : elements) { + for (const std::string& e : elements) { if (boost::starts_with(e, "Face")) { getFaceColor(e, colors); } diff --git a/src/Mod/Part/Gui/TaskLoft.cpp b/src/Mod/Part/Gui/TaskLoft.cpp index ba039e95ac..7234b9a956 100644 --- a/src/Mod/Part/Gui/TaskLoft.cpp +++ b/src/Mod/Part/Gui/TaskLoft.cpp @@ -200,7 +200,7 @@ bool LoftWidget::accept() "App.getDocument('%5').ActiveObject.Solid=%2\n" "App.getDocument('%5').ActiveObject.Ruled=%3\n" "App.getDocument('%5').ActiveObject.Closed=%4\n" - ).arg(list).arg(solid).arg(ruled).arg(closed).arg(QString::fromLatin1(d->document.c_str())); + ).arg(list, solid, ruled, closed, QString::fromLatin1(d->document.c_str())); Gui::Document* doc = Gui::Application::Instance->getDocument(d->document.c_str()); if (!doc) diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index d0585b6968..c43a8d4ca8 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -255,7 +255,7 @@ void ShapeBuilderWidget::createEdgeFromVertex() "if _.isNull(): raise RuntimeError('Failed to create edge')\n" "App.ActiveDocument.addObject('Part::Feature','Edge').Shape=_\n" "del _\n" - ).arg(elements[0]).arg(elements[1]); + ).arg(elements[0], elements[1]); try { Gui::Application::Instance->activeDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Edge")); diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp index 643e0b6bc9..9d4b3053d0 100644 --- a/src/Mod/Part/Gui/TaskSweep.cpp +++ b/src/Mod/Part/Gui/TaskSweep.cpp @@ -359,11 +359,11 @@ bool SweepWidget::accept() "App.getDocument('%5').ActiveObject.Solid=%3\n" "App.getDocument('%5').ActiveObject.Frenet=%4\n" ) - .arg(list) - .arg(QLatin1String(selection.c_str())) - .arg(solid) - .arg(frenet) - .arg(QString::fromLatin1(d->document.c_str())); + .arg(list, + QLatin1String(selection.c_str()), + solid, + frenet, + QString::fromLatin1(d->document.c_str())); Gui::Document* doc = Gui::Application::Instance->getDocument(d->document.c_str()); if (!doc) diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp index 2ee423b1d8..1ef778b688 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp @@ -89,7 +89,7 @@ ViewProviderCurveNet::~ViewProviderCurveNet() void ViewProviderCurveNet::attach(App::DocumentObject *pcFeat) { // call parent attach method - ViewProviderGeometryObject::attach(pcFeat); + ViewProviderGeometryObject::attach(pcFeat); // clazy:exclude=skipped-base-method // setup the root and material for the edges SoSeparator* ModeRoot = new SoSeparator(); @@ -111,7 +111,7 @@ void ViewProviderCurveNet::attach(App::DocumentObject *pcFeat) void ViewProviderCurveNet::updateData(const App::Property* prop) { - Gui::ViewProviderGeometryObject::updateData(prop); + Gui::ViewProviderGeometryObject::updateData(prop); // clazy:exclude=skipped-base-method if (prop->getTypeId() == Part::PropertyPartShape::getClassTypeId()) { TopoDS_Shape cShape = static_cast(prop)->getValue(); if (cShape.IsNull())