diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index 5ecd5524a5..64e4f6b52c 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -355,7 +355,7 @@ void CrossSections::apply() s += "_cs"; Gui::Command::runCommand( Gui::Command::App, - QString::fromLatin1( + QStringLiteral( "points=FreeCAD.getDocument(\"%1\").%2.Mesh.crossSections(%3, %4, %5)\n" "wires=[]\n" "for i in points:\n" @@ -369,7 +369,7 @@ void CrossSections::apply() Gui::Command::runCommand( Gui::Command::App, - QString::fromLatin1( + QStringLiteral( "comp=Part.Compound(wires)\n" "slice=FreeCAD.getDocument(\"%1\").addObject(\"Part::Feature\",\"%2\")\n" "slice.Shape=comp\n" diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp index 39e088d051..7f56c69428 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp @@ -54,10 +54,10 @@ CurveOnMeshWidget::~CurveOnMeshWidget() void CurveOnMeshWidget::setup() { ui->meshTolerance->setValue(0.2); - ui->continuity->addItem(QString::fromLatin1("C0"), static_cast(GeomAbs_C0)); - ui->continuity->addItem(QString::fromLatin1("C1"), static_cast(GeomAbs_C1)); - ui->continuity->addItem(QString::fromLatin1("C2"), static_cast(GeomAbs_C2)); - ui->continuity->addItem(QString::fromLatin1("C3"), static_cast(GeomAbs_C3)); + ui->continuity->addItem(QStringLiteral("C0"), static_cast(GeomAbs_C0)); + ui->continuity->addItem(QStringLiteral("C1"), static_cast(GeomAbs_C1)); + ui->continuity->addItem(QStringLiteral("C2"), static_cast(GeomAbs_C2)); + ui->continuity->addItem(QStringLiteral("C3"), static_cast(GeomAbs_C3)); ui->continuity->setCurrentIndex(2); for (int i = 0; i < 8; i++) { diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index 875f98433c..c16dab8c77 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -330,15 +330,14 @@ void Tessellation::process(int method, QString param = getMeshingParameters(method, sobj); - QString cmd = - QString::fromLatin1("__doc__=FreeCAD.getDocument(\"%1\")\n" - "__mesh__=__doc__.addObject(\"Mesh::Feature\",\"Mesh\")\n" - "__part__=__doc__.getObject(\"%2\")\n" - "__shape__=Part.getShape(__part__,\"%3\")\n" - "__mesh__.Mesh=MeshPart.meshFromShape(%4)\n" - "__mesh__.Label=\"%5 (Meshed)\"\n" - "del __doc__, __mesh__, __part__, __shape__\n") - .arg(this->document, objname, subname, param, label); + QString cmd = QStringLiteral("__doc__=FreeCAD.getDocument(\"%1\")\n" + "__mesh__=__doc__.addObject(\"Mesh::Feature\",\"Mesh\")\n" + "__part__=__doc__.getObject(\"%2\")\n" + "__shape__=Part.getShape(__part__,\"%3\")\n" + "__mesh__.Mesh=MeshPart.meshFromShape(%4)\n" + "__mesh__.Label=\"%5 (Meshed)\"\n" + "del __doc__, __mesh__, __part__, __shape__\n") + .arg(this->document, objname, subname, param, label); Gui::Command::runCommand(Gui::Command::Doc, cmd.toUtf8()); @@ -453,15 +452,15 @@ QString Tessellation::getStandardParameters(App::DocumentObject* obj) const bool relative = ui->relativeDeviation->isChecked(); QString param; - param = QString::fromLatin1("Shape=__shape__, " - "LinearDeflection=%1, " - "AngularDeflection=%2, " - "Relative=%3") + param = QStringLiteral("Shape=__shape__, " + "LinearDeflection=%1, " + "AngularDeflection=%2, " + "Relative=%3") .arg(devFace) .arg(devAngle) - .arg(relative ? QString::fromLatin1("True") : QString::fromLatin1("False")); + .arg(relative ? QStringLiteral("True") : QStringLiteral("False")); if (ui->meshShapeColors->isChecked()) { - param += QString::fromLatin1(",Segments=True"); + param += QStringLiteral(",Segments=True"); } auto svp = Base::freecad_dynamic_cast( @@ -478,10 +477,9 @@ QString Tessellation::getStandardParameters(App::DocumentObject* obj) const // // PartGui::ViewProviderPartExt::getShapeColors(). // - param += - QString::fromLatin1(",GroupColors=Gui.getDocument('%1').getObject('%2').DiffuseColor") - .arg(QString::fromLatin1(obj->getDocument()->getName()), - QString::fromLatin1(obj->getNameInDocument())); + param += QStringLiteral(",GroupColors=Gui.getDocument('%1').getObject('%2').DiffuseColor") + .arg(QString::fromLatin1(obj->getDocument()->getName()), + QString::fromLatin1(obj->getNameInDocument())); } return param; @@ -493,7 +491,7 @@ QString Tessellation::getMefistoParameters() const if (!ui->spinMaximumEdgeLength->isEnabled()) { maxEdge = 0; } - return QString::fromLatin1("Shape=__shape__,MaxLength=%1").arg(maxEdge); + return QStringLiteral("Shape=__shape__,MaxLength=%1").arg(maxEdge); } QString Tessellation::getNetgenParameters() const @@ -507,17 +505,17 @@ QString Tessellation::getNetgenParameters() const bool optimize = ui->checkOptimizeSurface->isChecked(); bool allowquad = ui->checkQuadDominated->isChecked(); if (fineness <= int(VeryFine)) { - param = QString::fromLatin1("Shape=__shape__," - "Fineness=%1,SecondOrder=%2,Optimize=%3,AllowQuad=%4") + param = QStringLiteral("Shape=__shape__," + "Fineness=%1,SecondOrder=%2,Optimize=%3,AllowQuad=%4") .arg(fineness) .arg(secondOrder ? 1 : 0) .arg(optimize ? 1 : 0) .arg(allowquad ? 1 : 0); } else { - param = QString::fromLatin1("Shape=__shape__," - "GrowthRate=%1,SegPerEdge=%2,SegPerRadius=%3,SecondOrder=%4," - "Optimize=%5,AllowQuad=%6") + param = QStringLiteral("Shape=__shape__," + "GrowthRate=%1,SegPerEdge=%2,SegPerRadius=%3,SecondOrder=%4," + "Optimize=%5,AllowQuad=%6") .arg(growthRate) .arg(nbSegPerEdge) .arg(nbSegPerRadius)