From c64aec5fd28d70c544462ba48cb7b8fb38c383ab Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 11 Feb 2019 13:46:58 +0100 Subject: [PATCH] simplify creation of strings --- src/Gui/Selection.cpp | 12 ++++-------- src/Gui/SoFCCSysDragger.cpp | 10 ++++++---- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 13 +++++-------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp index e6c8ebd0ad..7f803a8893 100644 --- a/src/Gui/Selection.cpp +++ b/src/Gui/Selection.cpp @@ -506,14 +506,10 @@ bool SelectionSingleton::setPreselect(const char* pDocName, const char* pObjectN } else { msg = QCoreApplication::translate("SelectionFilter","Not allowed:"); } - msg += QString::fromUtf8(" "); - msg.append( - QObject::tr("%1.%2.%3") - .arg(QString::fromLatin1(pDocName)) - .arg(QString::fromLatin1(pObjectName)) - .arg(QString::fromLatin1(pSubName)) - ); - msg += QString::fromUtf8(" "); + msg.append(QString::fromLatin1(" %1.%2.%3 ") + .arg(QString::fromLatin1(pDocName)) + .arg(QString::fromLatin1(pObjectName)) + .arg(QString::fromLatin1(pSubName))); if (getMainWindow()) { getMainWindow()->showMessage(msg); diff --git a/src/Gui/SoFCCSysDragger.cpp b/src/Gui/SoFCCSysDragger.cpp index 1aa2e38b4f..062cddb614 100644 --- a/src/Gui/SoFCCSysDragger.cpp +++ b/src/Gui/SoFCCSysDragger.cpp @@ -291,8 +291,9 @@ void TDragger::drag() Base::Quantity quantity( static_cast(translationIncrementCount.getValue()) * translationIncrement.getValue(), Base::Unit::Length); - QString message(QObject::tr("Translation:")+QString::fromUtf8(" ")); - message += quantity.getUserString(); + QString message = QString::fromLatin1("%1 %2") + .arg(QObject::tr("Translation:")) + .arg(quantity.getUserString()); getMainWindow()->showMessage(message, 3000); } @@ -576,8 +577,9 @@ void RDragger::drag() static_cast(rotationIncrementCount.getValue()) * (180.0 / M_PI) * rotationIncrement.getValue(), Base::Unit::Angle); - QString message(QObject::tr("Rotation:")+QString::fromUtf8(" ")); - message += quantity.getUserString(); + QString message = QString::fromLatin1("%1 %2") + .arg(QObject::tr("Rotation:")) + .arg(quantity.getUserString()); getMainWindow()->showMessage(message, 3000); } diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index ce62a5f0e3..f356360bc7 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -1218,14 +1218,11 @@ bool MDIViewPage::compareSelections(std::vector treeSel, Q void MDIViewPage::showStatusMsg(const char* s1, const char* s2, const char* s3) const { - QString msg = tr("Selected:"); - msg += QString::fromUtf8(" "); - msg.append(QObject::tr("%1.%2.%3") - .arg(QString::fromUtf8(s1)) - .arg(QString::fromUtf8(s2)) - .arg(QString::fromUtf8(s3)) - ); - msg += QString::fromUtf8(" "); + QString msg = QString::fromLatin1("%1 %2.%3.%4 ") + .arg(tr("Selected:")) + .arg(QString::fromUtf8(s1)) + .arg(QString::fromUtf8(s2)) + .arg(QString::fromUtf8(s3)); if (Gui::getMainWindow()) { Gui::getMainWindow()->showMessage(msg,3000); }