diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 7e1562a3d4..567482260f 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -86,8 +86,8 @@ void CmdRobotExportKukaCompact::activated(int) // std::string TrakName = pcTrajectoryObject->getNameInDocument(); QStringList filter; - filter << QString::fromLatin1("%1 (*.src)").arg(QObject::tr("KRL file")); - filter << QString::fromLatin1("%1 (*.*)").arg(QObject::tr("All Files")); + filter << QStringLiteral("%1 (*.src)").arg(QObject::tr("KRL file")); + filter << QStringLiteral("%1 (*.*)").arg(QObject::tr("All Files")); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export program"), QString(), @@ -161,8 +161,8 @@ void CmdRobotExportKukaFull::activated(int) // std::string TrakName = pcTrajectoryObject->getNameInDocument(); QStringList filter; - filter << QString::fromLatin1("%1 (*.src)").arg(QObject::tr("KRL file")); - filter << QString::fromLatin1("%1 (*.*)").arg(QObject::tr("All Files")); + filter << QStringLiteral("%1 (*.src)").arg(QObject::tr("KRL file")); + filter << QStringLiteral("%1 (*.*)").arg(QObject::tr("All Files")); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export program"), QString(), diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 5940074aac..5a60f1884d 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -294,7 +294,7 @@ void CmdRobotSetDefaultValues::activated(int) QObject::tr("Set default speed"), QObject::tr("speed: (e.g. 1 m/s or 3 cm/s)"), QLineEdit::Normal, - QString::fromLatin1("1 m/s"), + QStringLiteral("1 m/s"), &ok, Qt::MSWindowsFixedSizeDialogHint); if (ok && !text.isEmpty()) { @@ -302,7 +302,7 @@ void CmdRobotSetDefaultValues::activated(int) } QStringList items; - items << QString::fromLatin1("False") << QString::fromLatin1("True"); + items << QStringLiteral("False") << QStringLiteral("True"); QString item = QInputDialog::getItem(nullptr, QObject::tr("Set default continuity"), @@ -322,7 +322,7 @@ void CmdRobotSetDefaultValues::activated(int) QObject::tr("Set default acceleration"), QObject::tr("acceleration: (e.g. 1 m/s^2 or 3 cm/s^2)"), QLineEdit::Normal, - QString::fromLatin1("1 m/s^2"), + QStringLiteral("1 m/s^2"), &ok, Qt::MSWindowsFixedSizeDialogHint); if (ok && !text.isEmpty()) { diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp index 128c3424ba..9c3310fb51 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp @@ -117,7 +117,7 @@ void TaskEdge2TracParameter::setEdgeAndClusterNbr(int NbrEdges, int NbrClusters) palette.setBrush(QPalette::WindowText, QColor(a, p, p)); } - text = QString::fromLatin1("Edges: %1").arg(NbrEdges); + text = QStringLiteral("Edges: %1").arg(NbrEdges); ui->label_Edges->setPalette(palette); ui->label_Edges->setText(text); @@ -129,7 +129,7 @@ void TaskEdge2TracParameter::setEdgeAndClusterNbr(int NbrEdges, int NbrClusters) palette.setBrush(QPalette::WindowText, QColor(a, p, p)); } - text = QString::fromLatin1("Cluster: %1").arg(NbrClusters); + text = QStringLiteral("Cluster: %1").arg(NbrClusters); ui->label_Cluster->setPalette(palette); ui->label_Cluster->setText(text); } diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp index 809df4d69f..030878c143 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp @@ -131,7 +131,7 @@ void TaskRobot6Axis::viewTcp(const Base::Placement& pos) double A, B, C; pos.getRotation().getYawPitchRoll(A, B, C); - QString result = QString::fromLatin1("TCP:( %1, %2, %3, %4, %5, %6 )") + QString result = QStringLiteral("TCP:( %1, %2, %3, %4, %5, %6 )") .arg(pos.getPosition().x, 0, 'f', 1) .arg(pos.getPosition().y, 0, 'f', 1) .arg(pos.getPosition().z, 0, 'f', 1) @@ -147,7 +147,7 @@ void TaskRobot6Axis::viewTool(const Base::Placement& pos) double A, B, C; pos.getRotation().getYawPitchRoll(A, B, C); - QString result = QString::fromLatin1("Tool:( %1, %2, %3, %4, %5, %6 )") + QString result = QStringLiteral("Tool:( %1, %2, %3, %4, %5, %6 )") .arg(pos.getPosition().x, 0, 'f', 1) .arg(pos.getPosition().y, 0, 'f', 1) .arg(pos.getPosition().z, 0, 'f', 1) @@ -186,7 +186,7 @@ void TaskRobot6Axis::changeSliderA4(int value) { pcRobot->Axis4.setValue(float(value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg((float)value, 0, 'f', 1)); + ui->lineEdit_Axis4->setText(QStringLiteral("%1°").arg((float)value, 0, 'f', 1)); setColor(3, float(value), *(ui->lineEdit_Axis4)); } @@ -194,7 +194,7 @@ void TaskRobot6Axis::changeSliderA5(int value) { pcRobot->Axis5.setValue(float(value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg((float)value, 0, 'f', 1)); + ui->lineEdit_Axis5->setText(QStringLiteral("%1°").arg((float)value, 0, 'f', 1)); setColor(4, float(value), *(ui->lineEdit_Axis5)); } @@ -202,7 +202,7 @@ void TaskRobot6Axis::changeSliderA6(int value) { pcRobot->Axis6.setValue(float(value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg((float)value, 0, 'f', 1)); + ui->lineEdit_Axis6->setText(QStringLiteral("%1°").arg((float)value, 0, 'f', 1)); setColor(5, float(value), *(ui->lineEdit_Axis6)); } void TaskRobot6Axis::setColor(int i, float angle, QLineEdit& lineEdit) @@ -229,27 +229,27 @@ void TaskRobot6Axis::setAxis(float A1, const Base::Placement& Tcp) { ui->horizontalSlider_Axis1->setSliderPosition((int)A1); - ui->lineEdit_Axis1->setText(QString::fromLatin1("%1°").arg(A1, 0, 'f', 1)); + ui->lineEdit_Axis1->setText(QStringLiteral("%1°").arg(A1, 0, 'f', 1)); setColor(0, A1, *(ui->lineEdit_Axis1)); ui->horizontalSlider_Axis2->setSliderPosition((int)A2); - ui->lineEdit_Axis2->setText(QString::fromLatin1("%1°").arg(A2, 0, 'f', 1)); + ui->lineEdit_Axis2->setText(QStringLiteral("%1°").arg(A2, 0, 'f', 1)); setColor(1, A2, *(ui->lineEdit_Axis2)); ui->horizontalSlider_Axis3->setSliderPosition((int)A3); - ui->lineEdit_Axis3->setText(QString::fromLatin1("%1°").arg(A3, 0, 'f', 1)); + ui->lineEdit_Axis3->setText(QStringLiteral("%1°").arg(A3, 0, 'f', 1)); setColor(2, A3, *(ui->lineEdit_Axis3)); ui->horizontalSlider_Axis4->setSliderPosition((int)A4); - ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg(A4, 0, 'f', 1)); + ui->lineEdit_Axis4->setText(QStringLiteral("%1°").arg(A4, 0, 'f', 1)); setColor(3, A4, *(ui->lineEdit_Axis4)); ui->horizontalSlider_Axis5->setSliderPosition((int)A5); - ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg(A5, 0, 'f', 1)); + ui->lineEdit_Axis5->setText(QStringLiteral("%1°").arg(A5, 0, 'f', 1)); setColor(4, A5, *(ui->lineEdit_Axis5)); ui->horizontalSlider_Axis6->setSliderPosition((int)A6); - ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg(A6, 0, 'f', 1)); + ui->lineEdit_Axis6->setText(QStringLiteral("%1°").arg(A6, 0, 'f', 1)); setColor(5, A6, *(ui->lineEdit_Axis6)); viewTcp(Tcp); diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp index 7db9b05fa8..6d85b308c5 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp @@ -65,39 +65,29 @@ TaskTrajectory::TaskTrajectory(Robot::RobotObject* pcRobotObject, Robot::Waypoint pt = trac.getWaypoint(i); switch (pt.Type) { case Robot::Waypoint::UNDEF: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("UNDEF"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("UNDEF"))); break; case Robot::Waypoint::CIRC: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("CIRC"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("CIRC"))); break; case Robot::Waypoint::PTP: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("PTP"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("PTP"))); break; case Robot::Waypoint::LINE: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("LIN"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("LIN"))); break; default: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("UNDEF"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("UNDEF"))); break; } ui->trajectoryTable->setItem(i, 1, new QTableWidgetItem(QString::fromUtf8(pt.Name.c_str()))); if (pt.Cont) { - ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("|"))); + ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QStringLiteral("|"))); } else { - ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("-"))); + ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QStringLiteral("-"))); } ui->trajectoryTable->setItem(i, 3, new QTableWidgetItem(QString::number(pt.Velocity))); ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Acceleration))); @@ -140,7 +130,7 @@ void TaskTrajectory::viewTool(const Base::Placement& pos) double A, B, C; pos.getRotation().getYawPitchRoll(A, B, C); - QString result = QString::fromLatin1("Pos:(%1, %2, %3, %4, %5, %6)") + QString result = QStringLiteral("Pos:(%1, %2, %3, %4, %5, %6)") .arg(pos.getPosition().x, 0, 'f', 1) .arg(pos.getPosition().y, 0, 'f', 1) .arg(pos.getPosition().z, 0, 'f', 1) diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp index c16c8d0741..6fa4a341c3 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp @@ -103,7 +103,7 @@ void TaskTrajectoryDressUpParameter::viewPlacement() double A, B, C; Base::Vector3d pos = PosAdd.getPosition(); PosAdd.getRotation().getYawPitchRoll(A, B, C); - QString val = QString::fromLatin1("(%1,%2,%3),(%4,%5,%6)\n") + QString val = QStringLiteral("(%1,%2,%3),(%4,%5,%6)\n") .arg(pos.x, 0, 'g', 6) .arg(pos.y, 0, 'g', 6) .arg(pos.z, 0, 'g', 6) diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.cpp b/src/Mod/Robot/Gui/TrajectorySimulate.cpp index 378f027279..ec7c01455b 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.cpp +++ b/src/Mod/Robot/Gui/TrajectorySimulate.cpp @@ -63,39 +63,29 @@ TrajectorySimulate::TrajectorySimulate(Robot::RobotObject* pcRobotObject, Robot::Waypoint pt = trac.getWaypoint(i); switch (pt.Type) { case Robot::Waypoint::UNDEF: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("UNDEF"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("UNDEF"))); break; case Robot::Waypoint::CIRC: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("CIRC"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("CIRC"))); break; case Robot::Waypoint::PTP: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("PTP"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("PTP"))); break; case Robot::Waypoint::LINE: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("LIN"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("LIN"))); break; default: - ui->trajectoryTable->setItem(i, - 0, - new QTableWidgetItem(QString::fromLatin1("UNDEF"))); + ui->trajectoryTable->setItem(i, 0, new QTableWidgetItem(QStringLiteral("UNDEF"))); break; } ui->trajectoryTable->setItem(i, 1, new QTableWidgetItem(QString::fromUtf8(pt.Name.c_str()))); if (pt.Cont) { - ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("|"))); + ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QStringLiteral("|"))); } else { - ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("-"))); + ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QStringLiteral("-"))); } ui->trajectoryTable->setItem(i, 3, new QTableWidgetItem(QString::number(pt.Velocity))); ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Acceleration))); diff --git a/src/Mod/Robot/Gui/Workbench.cpp b/src/Mod/Robot/Gui/Workbench.cpp index b28317a55d..8b7bfb6ced 100644 --- a/src/Mod/Robot/Gui/Workbench.cpp +++ b/src/Mod/Robot/Gui/Workbench.cpp @@ -63,8 +63,8 @@ Workbench::~Workbench() = default; void Workbench::activated() { std::string res = App::Application::getResourceDir(); - QString dir = QString::fromLatin1("%1/Mod/Robot/Lib/Kuka").arg(QString::fromUtf8(res.c_str())); - QFileInfo fi(dir, QString::fromLatin1("kr_16.csv")); + QString dir = QStringLiteral("%1/Mod/Robot/Lib/Kuka").arg(QString::fromUtf8(res.c_str())); + QFileInfo fi(dir, QStringLiteral("kr_16.csv")); if (!fi.exists()) { Gui::WaitCursor wc; @@ -73,8 +73,8 @@ void Workbench::activated() Gui::getMainWindow(), QObject::tr("No robot files installed"), QObject::tr("Please visit %1 and copy the files to %2") - .arg(QString::fromLatin1("https://github.com/FreeCAD/FreeCAD/tree/master" - "/src/Mod/Robot/Lib/Kuka"), + .arg(QStringLiteral("https://github.com/FreeCAD/FreeCAD/tree/master" + "/src/Mod/Robot/Lib/Kuka"), dir)); wc.setWaitCursor(); }