From eeca005a95c036e08bfada0bec4eac24b8f45da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Fri, 14 Feb 2025 12:28:23 +0100 Subject: [PATCH] Gui: use QStringLiteral 2 --- src/Gui/3Dconnexion/navlib/NavlibPivot.cpp | 2 +- src/Gui/Dialogs/DlgMacroExecuteImp.cpp | 18 +++++++++--------- src/Gui/MainWindow.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp index 86237942bb..9a08f21eaf 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp @@ -284,7 +284,7 @@ void NavlibInterface::initializePivot() pivot.pDepthTestAlways->function.setValue(SoDepthBufferElement::ALWAYS); pivot.pDepthTestLess->function.setValue(SoDepthBufferElement::LESS); - pivot.pivotImage = QImage(QString::fromStdString(":/icons/3dx_pivot.png")); + pivot.pivotImage = QImage(QStringLiteral(":/icons/3dx_pivot.png")); Gui::BitmapFactory().convert(pivot.pivotImage, pivot.pImage->image); pivot.pVisibility->ref(); diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp index 4822c6df75..88cb07909f 100644 --- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp +++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp @@ -471,7 +471,7 @@ void DlgMacroExecuteImp::onCreateButtonClicked() Qt::MSWindowsFixedSizeDialogHint); if (replaceSpaces) { - fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_")); + fn = fn.replace(QStringLiteral(" "), QStringLiteral("_")); } if (!fn.isEmpty()) { @@ -867,7 +867,7 @@ void DlgMacroExecuteImp::onRenameButtonClicked() Qt::MSWindowsFixedSizeDialogHint); if (replaceSpaces) { - fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_")); + fn = fn.replace(QStringLiteral(" "), QStringLiteral("_")); } if (!fn.isEmpty() && fn != oldName) { @@ -957,11 +957,11 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked() QString completeSuffix = oldfi.completeSuffix(); // everything after the first "." QString extraNote = completeSuffix.left(completeSuffix.size() - oldfi.suffix().size()); QString baseName = oldfi.baseName(); // everything before first "." - QString neutralSymbol = QString::fromStdString("@"); + QString neutralSymbol = QStringLiteral("@"); QString last3 = baseName.right(3); bool ok = true; // was conversion to int successful? int nLast3 = last3.toInt(&ok); - last3 = QString::fromStdString("001"); // increment beginning with 001 unless from001 = false + last3 = QStringLiteral("001"); // increment beginning with 001 unless from001 = false if (ok) { // last3 were all digits, so we strip them from the base name if (baseName.size() > 3) { // if <= 3 leave be (e.g. 2.py becomes 2@001.py) @@ -987,13 +987,13 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked() nLast3++; last3 = QString::number(nLast3); while (last3.size() < 3) { - last3.prepend(QString::fromStdString("0")); // pad 0's if needed + last3.prepend(QStringLiteral("0")); // pad 0's if needed } } QString oldNameDigitized = - baseName + neutralSymbol + last3 + QString::fromStdString(".") + completeSuffix; + baseName + neutralSymbol + last3 + QStringLiteral(".") + completeSuffix; QFileInfo fi(dir, oldNameDigitized); @@ -1007,10 +1007,10 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked() } last3 = QString::number(nLast3); while (last3.size() < 3) { - last3.prepend(QString::fromStdString("0")); // pad 0's if needed + last3.prepend(QStringLiteral("0")); // pad 0's if needed } oldNameDigitized = - baseName + neutralSymbol + last3 + QString::fromStdString(".") + completeSuffix; + baseName + neutralSymbol + last3 + QStringLiteral(".") + completeSuffix; fi = QFileInfo(dir, oldNameDigitized); } @@ -1027,7 +1027,7 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked() nullptr, Qt::MSWindowsFixedSizeDialogHint); if (replaceSpaces) { - fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_")); + fn = fn.replace(QStringLiteral(" "), QStringLiteral("_")); } if (!fn.isEmpty() && fn != oldName) { QString suffix = QFileInfo(fn).suffix().toLower(); diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index a315a2209a..c02f15cdf6 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1493,7 +1493,7 @@ void MainWindow::processMessages(const QList & msg) try { WaitCursor wc; std::list files; - QString action = QString::fromStdString("OpenFile:"); + QString action = QStringLiteral("OpenFile:"); for (const auto & it : msg) { if (it.startsWith(action)) files.emplace_back(it.mid(action.size()).toStdString());