PD: [skip ci] Fix several clazy issues:
* Maybe you meant to call base method instead [-Wclazy-skipped-base-method] * Missing reference in range-for with non trivial type [-Wclazy-range-loop-reference] * Mixing iterators with const_iterators [-Wclazy-strict-iterators] * Unused QByteArray [-Wclazy-unused-non-trivial-variable] * C++11 range-loop might detach Qt container (QList) [-Wclazy-range-loop-detach]
This commit is contained in:
wmayer
@@ -691,10 +691,10 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Length=%2\n"
|
||||
"%1.Width=%3\n"
|
||||
"%1.Height=%4\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
Base::UnitsApi::toNumber(ui->boxLength->value(), format),
|
||||
Base::UnitsApi::toNumber(ui->boxWidth->value(), format),
|
||||
Base::UnitsApi::toNumber(ui->boxHeight->value(), format));
|
||||
break;
|
||||
|
||||
case 2: // cylinder
|
||||
@@ -704,12 +704,12 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Angle=%4\n"
|
||||
"%1.FirstAngle=%5\n"
|
||||
"%1.SecondAngle=%6\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
|
||||
case 3: // cone
|
||||
@@ -724,11 +724,11 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Radius2=%3\n"
|
||||
"%1.Height=%4\n"
|
||||
"%1.Angle=%5\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
|
||||
case 4: // sphere
|
||||
@@ -737,11 +737,11 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Angle1=%3\n"
|
||||
"%1.Angle2=%4\n"
|
||||
"%1.Angle3=%5\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
case 5: // ellipsoid
|
||||
cmd = QString::fromLatin1(
|
||||
@@ -751,13 +751,13 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Angle1=%5\n"
|
||||
"%1.Angle2=%6\n"
|
||||
"%1.Angle3=%7\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
|
||||
case 6: // torus
|
||||
@@ -767,12 +767,12 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Angle1=%4\n"
|
||||
"%1.Angle2=%5\n"
|
||||
"%1.Angle3=%6\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
case 7: // prism
|
||||
cmd = QString::fromLatin1(
|
||||
@@ -781,12 +781,12 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Height=%4\n"
|
||||
"%1.FirstAngle=%5\n"
|
||||
"%1.SecondAngle=%6\n")
|
||||
.arg(name)
|
||||
.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(name,
|
||||
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));
|
||||
break;
|
||||
case 8: // wedge
|
||||
// Xmin/max, Ymin/max and Zmin/max must each not be equal
|
||||
@@ -816,17 +816,17 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
"%1.Zmax=%9\n"
|
||||
"%1.X2max=%10\n"
|
||||
"%1.Z2max=%11\n")
|
||||
.arg(name)
|
||||
.arg(Base::UnitsApi::toNumber(ui->wedgeXmin->value()))
|
||||
.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(name,
|
||||
Base::UnitsApi::toNumber(ui->wedgeXmin->value()),
|
||||
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),
|
||||
Base::UnitsApi::toNumber(ui->wedgeZmax->value(), format))
|
||||
.arg(Base::UnitsApi::toNumber(ui->wedgeX2max->value(), format),
|
||||
Base::UnitsApi::toNumber(ui->wedgeZ2max->value(), format));
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user