diff --git a/src/Base/UnitsSchema.cpp b/src/Base/UnitsSchema.cpp
index 9d8fc43080..e1f73c5fc6 100644
--- a/src/Base/UnitsSchema.cpp
+++ b/src/Base/UnitsSchema.cpp
@@ -46,5 +46,5 @@ QString UnitsSchema::toLocale(const Base::Quantity& quant, double factor, const
     }
 
     QString Ln = Lc.toString((quant.getValue() / factor), format.toFormat(), format.precision);
-    return QString::fromUtf8("%1 %2").arg(Ln).arg(unitString);
+    return QString::fromUtf8("%1 %2").arg(Ln, unitString);
 }
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 24d8f75b28..bc92355d80 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1797,7 +1797,7 @@ void Application::runApplication(void)
         std::map<std::string, std::string>& config = App::Application::Config();
         QString major  = QString::fromLatin1(config["BuildVersionMajor"].c_str());
         QString minor  = QString::fromLatin1(config["BuildVersionMinor"].c_str());
-        QString title = QString::fromLatin1("%1 %2.%3").arg(mainApp.applicationName()).arg(major).arg(minor);
+        QString title = QString::fromLatin1("%1 %2.%3").arg(mainApp.applicationName(), major, minor);
         mw.setWindowTitle(title);
     } else {
         mw.setWindowTitle(mainApp.applicationName());
diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp
index ab344d0436..ec34b8df15 100644
--- a/src/Gui/ApplicationPy.cpp
+++ b/src/Gui/ApplicationPy.cpp
@@ -389,7 +389,7 @@ PyObject* Application::sOpen(PyObject * /*self*/, PyObject *args)
                 "FileName=\"%2\"\n"
                 "App.ActiveDocument.ActiveObject.Label=\"%1\"\n"
                 "App.ActiveDocument.recompute()")
-                .arg(fi.baseName()).arg(fi.absoluteFilePath());
+                .arg(fi.baseName(), fi.absoluteFilePath());
             Base::Interpreter().runString(cmd.toUtf8());
         }
         else if (ext == QLatin1String("wrl") ||
@@ -408,7 +408,7 @@ PyObject* Application::sOpen(PyObject * /*self*/, PyObject *args)
                 "VrmlFile=\"%2\"\n"
                 "App.ActiveDocument.ActiveObject.Label=\"%1\"\n"
                 "App.ActiveDocument.recompute()")
-                .arg(fi.baseName()).arg(fi.absoluteFilePath());
+                .arg(fi.baseName(), fi.absoluteFilePath());
             Base::Interpreter().runString(cmd.toUtf8());
             SoInput::removeDirectory(path.constData());
         }
diff --git a/src/Gui/Assistant.cpp b/src/Gui/Assistant.cpp
index 767295857b..894af99545 100644
--- a/src/Gui/Assistant.cpp
+++ b/src/Gui/Assistant.cpp
@@ -96,22 +96,22 @@ bool Assistant::startAssistant()
 
         // get the name of the executable and the doc path
         QString exe = QString::fromUtf8(App::GetApplication().getExecutableName());
-        QString doc = QString::fromUtf8(App::Application::getHelpDir().c_str());
-        QString qhc = doc + exe.toLower() + QLatin1String(".qhc");
+        QString doc = QString::fromUtf8(App::Application::getHelpDir().c_str());
+        QString qhc = doc + exe.toLower() + QLatin1String(".qhc");
 
         QFileInfo fi(qhc);
         if (!fi.isReadable()) {
             QMessageBox::critical(0, tr("%1 Help").arg(exe),
-                tr("%1 help files not found (%2). You might need to install the %1 documentation package.").arg(exe).arg(qhc));
+                tr("%1 help files not found (%2). You might need to install the %1 documentation package.").arg(exe, qhc));
             return false;
         }
-
-        static bool first = true;
-        if (first) {
-            Base::Console().Log("Help file at %s\n", (const char*)qhc.toUtf8());
-            first = false;
+
+        static bool first = true;
+        if (first) {
+            Base::Console().Log("Help file at %s\n", (const char*)qhc.toUtf8());
+            first = false;
         }
-
+
         QStringList args;
 
         args << QLatin1String("-collectionFile") << qhc
diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp
index cf755c2fb6..5c8e7bf4cc 100644
--- a/src/Gui/BitmapFactory.cpp
+++ b/src/Gui/BitmapFactory.cpp
@@ -278,8 +278,8 @@ QPixmap BitmapFactoryInst::pixmap(const char* name) const
         if (!loadPixmap(fileName, icon)) {
             // Go through supported file formats
             for (QList<QByteArray>::iterator fm = formats.begin(); fm != formats.end(); ++fm) {
-                QString path = QString::fromLatin1("%1.%2").arg(fileName).
-                    arg(QString::fromLatin1((*fm).toLower().constData()));
+                QString path = QString::fromLatin1("%1.%2").arg(fileName,
+                    QString::fromLatin1((*fm).toLower().constData()));
                 if (loadPixmap(path, icon)) {
                     break;
                 }
diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index 50064a91b9..3edb99cf2f 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -625,12 +625,12 @@ void Command::applyCommandData(const char* context, Action* action)
     if (!accel.isEmpty()) {
         // show shortcut inside tooltip
         QString ttip = QString::fromLatin1("%1 (%2)")
-            .arg(action->toolTip()).arg(accel);
+            .arg(action->toolTip(), accel);
         action->setToolTip(ttip);
 
         // show shortcut inside status tip
         QString stip = QString::fromLatin1("(%1)\t%2")
-            .arg(accel).arg(action->statusTip());
+            .arg(accel, action->statusTip());
         action->setStatusTip(stip);
     }
 }
@@ -792,12 +792,12 @@ Action * MacroCommand::createAction(void)
     if (!accel.isEmpty()) {
         // show shortcut inside tooltip
         QString ttip = QString::fromLatin1("%1 (%2)")
-            .arg(pcAction->toolTip()).arg(accel);
+            .arg(pcAction->toolTip(), accel);
         pcAction->setToolTip(ttip);
 
         // show shortcut inside status tip
         QString stip = QString::fromLatin1("(%1)\t%2")
-            .arg(accel).arg(pcAction->statusTip());
+            .arg(accel, pcAction->statusTip());
         pcAction->setStatusTip(stip);
     }
 
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index c683d52c95..ad53be551e 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -1782,8 +1782,8 @@ void StdViewScreenShot::activated(int iMsg)
         QStringList filter;
         QString selFilter;
         for (QStringList::Iterator it = formats.begin(); it != formats.end(); ++it) {
-            filter << QString::fromLatin1("%1 %2 (*.%3)").arg((*it).toUpper()).
-                arg(QObject::tr("files")).arg((*it).toLower());
+            filter << QString::fromLatin1("%1 %2 (*.%3)").arg((*it).toUpper(),
+                QObject::tr("files"), (*it).toLower());
             if (ext == *it)
                 selFilter = filter.last();
         }
diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp
index 39483dda1c..e4d9fc0ed4 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/DlgActionsImp.cpp
@@ -356,12 +356,12 @@ void DlgCustomActionsImp::on_buttonReplaceAction_clicked()
         if (!accel.isEmpty()) {
             // show shortcut inside tooltip
             QString ttip = QString::fromLatin1("%1 (%2)")
-                .arg(action->toolTip()).arg(accel);
+                .arg(action->toolTip(), accel);
             action->setToolTip(ttip);
 
             // show shortcut inside status tip
             QString stip = QString::fromLatin1("(%1)\t%2")
-                .arg(accel).arg(action->statusTip());
+                .arg(accel, action->statusTip());
             action->setStatusTip(stip);
         }
     }
diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/DlgKeyboardImp.cpp
index be6233e2e9..ce1bf3fa09 100644
--- a/src/Gui/DlgKeyboardImp.cpp
+++ b/src/Gui/DlgKeyboardImp.cpp
@@ -234,7 +234,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
         if (!accel.isEmpty()) {
             if (!toolTip.isEmpty()) {
                 QString tip = QString::fromLatin1("%1 (%2)")
-                    .arg(toolTip).arg(accel);
+                    .arg(toolTip, accel);
                 action->setToolTip(tip);
             }
         }
@@ -250,7 +250,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
         if (!accel.isEmpty()) {
             if (!statusTip.isEmpty()) {
                 QString tip = QString::fromLatin1("(%1)\t%2")
-                    .arg(accel).arg(statusTip);
+                    .arg(accel, statusTip);
                 action->setStatusTip(tip);
             }
         }
@@ -405,7 +405,7 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
         else if (countAmbiguous == 1 && ambiguousCommand != QLatin1String(name)) {
             int ret = QMessageBox::warning(this, tr("Already defined shortcut"),
                                  tr("The shortcut '%1' is already assigned to '%2'.\n\nDo you want to override it?")
-                                 .arg(sc).arg(ambiguousMenu), QMessageBox::Yes | QMessageBox::No);
+                                 .arg(sc, ambiguousMenu), QMessageBox::Yes | QMessageBox::No);
             if (ret == QMessageBox::Yes) {
                 for (auto* cmd : ambiguousCommands) {
                     Action* action = cmd->getAction();
diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp
index 5d4c7e3c32..78916285c4 100644
--- a/src/Gui/DlgMacroExecuteImp.cpp
+++ b/src/Gui/DlgMacroExecuteImp.cpp
@@ -311,7 +311,7 @@ void DlgMacroExecuteImp::on_editButton_clicked()
 
     MacroItem * mitem = static_cast<MacroItem *>(item);
 
-    QString file = QString::fromLatin1("%1/%2").arg(dir.absolutePath()).arg(item->text(0));
+    QString file = QString::fromLatin1("%1/%2").arg(dir.absolutePath(), item->text(0));
     PythonEditor* editor = new PythonEditor();
     editor->setWindowIcon(Gui::BitmapFactory().iconFromTheme("applications-python"));
     PythonEditorView* edit = new PythonEditorView(editor, getMainWindow());
@@ -322,7 +322,7 @@ void DlgMacroExecuteImp::on_editButton_clicked()
     if (mitem->systemWide) {
         editor->setReadOnly(true);
         QString shownName;
-        shownName = QString::fromLatin1("%1[*] - [%2]").arg(item->text(0)).arg(tr("Read-only"));
+        shownName = QString::fromLatin1("%1[*] - [%2]").arg(item->text(0), tr("Read-only"));
         edit->setWindowTitle(shownName);
     }
 
diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp
index 81a1892b06..51d96b6207 100644
--- a/src/Gui/DlgUnitsCalculatorImp.cpp
+++ b/src/Gui/DlgUnitsCalculatorImp.cpp
@@ -110,7 +110,7 @@ void DlgUnitsCalculator::valueChanged(const Base::Quantity& quant)
         } else {
             double value = quant.getValue()/actUnit.getValue();
             QString val = QLocale::system().toString(value, 'f', Base::UnitsApi::getDecimals());
-            QString out = QString::fromLatin1("%1 %2").arg(val).arg(ui->UnitInput->text());
+            QString out = QString::fromLatin1("%1 %2").arg(val, ui->UnitInput->text());
             ui->ValueOutput->setText(out);
             ui->pushButton_Copy->setEnabled(true);
         }
diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index 771b0ac121..5e73272bbc 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -685,7 +685,7 @@ bool Document::saveAs(void)
 
     QString exe = qApp->applicationName();
     QString fn = FileDialog::getSaveFileName(getMainWindow(), QObject::tr("Save %1 Document").arg(exe), 
-        QString(), QString::fromLatin1("%1 %2 (*.FCStd)").arg(exe).arg(QObject::tr("Document")));
+        QString(), QString::fromLatin1("%1 %2 (*.FCStd)").arg(exe, QObject::tr("Document")));
     if (!fn.isEmpty()) {
         QFileInfo fi;
         fi.setFile(fn);
diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp
index 4434480943..5dc7db8c65 100644
--- a/src/Gui/DownloadItem.cpp
+++ b/src/Gui/DownloadItem.cpp
@@ -192,9 +192,9 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
 
     QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
 #if QT_VERSION >= 0x050000
-    introMessage = introMessage.arg(QString(reply->url().toString()).toHtmlEscaped()).arg(QString(reply->url().toString()).toHtmlEscaped());
+    introMessage = introMessage.arg(QString(reply->url().toString()).toHtmlEscaped(), QString(reply->url().toString()).toHtmlEscaped());
 #else
-    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    introMessage = introMessage.arg(Qt::escape(reply->url().toString()), Qt::escape(reply->url().toString()));
 #endif
     passwordDialog.siteDescription->setText(introMessage);
     passwordDialog.siteDescription->setWordWrap(true);
@@ -579,17 +579,17 @@ void DownloadItem::updateInfoLabel()
             .arg(timeRemaining)
             .arg(timeRemainingString);
         info = QString(tr("%1 of %2 (%3/sec) %4"))
-            .arg(dataString(m_bytesReceived))
-            .arg(bytesTotal == 0 ? tr("?") : dataString(bytesTotal))
-            .arg(dataString((int)speed))
-            .arg(remaining);
+            .arg(dataString(m_bytesReceived),
+                 bytesTotal == 0 ? tr("?") : dataString(bytesTotal),
+                 dataString((int)speed),
+                 remaining);
     } else {
         if (m_bytesReceived == bytesTotal)
             info = dataString(m_output.size());
         else
             info = tr("%1 of %2 - Stopped")
-                .arg(dataString(m_bytesReceived))
-                .arg(dataString(bytesTotal));
+                .arg(dataString(m_bytesReceived),
+                     dataString(bytesTotal));
     }
     downloadInfoLabel->setText(info);
 }
diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index 3e6a0551b3..e16491c681 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -115,7 +115,7 @@ void FileDialog::accept()
             // #0001928: do not add a suffix if a file with suffix is entered
             // #0002209: make sure that the entered suffix is part of one of the filters
             if (!ext.isEmpty() && (suffix.isEmpty() || !hasSuffix(suffix))) {
-                file = QString::fromLatin1("%1.%2").arg(file).arg(ext);
+                file = QString::fromLatin1("%1.%2").arg(file, ext);
                 // That's the built-in line edit
                 QLineEdit* fileNameEdit = this->findChild<QLineEdit*>(QString::fromLatin1("fileNameEdit"));
                 if (fileNameEdit)
@@ -525,7 +525,7 @@ void FileOptionsDialog::accept()
         if (ext.isEmpty())
             setDefaultSuffix(suf);
         else if (ext.toLower() != suf.toLower()) {
-            fn = QString::fromLatin1("%1.%2").arg(fn).arg(suf);
+            fn = QString::fromLatin1("%1.%2").arg(fn, suf);
             selectFile(fn);
             // That's the built-in line edit (fixes Debian bug #811200)
             QLineEdit* fileNameEdit = this->findChild<QLineEdit*>(QString::fromLatin1("fileNameEdit"));
@@ -823,7 +823,7 @@ SelectModule::SelectModule (const QString& type, const SelectModule::Dict& types
             module = module.left(pos);
         }
 
-        button->setText(QString::fromLatin1("%1 (%2)").arg(filter).arg(module));
+        button->setText(QString::fromLatin1("%1 (%2)").arg(filter, module));
         button->setObjectName(it.value());
         gridLayout1->addWidget(button, index, 0, 1, 1);
         group->addButton(button, index);
diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp
index d4496ddf8a..afffc62449 100644
--- a/src/Gui/GraphvizView.cpp
+++ b/src/Gui/GraphvizView.cpp
@@ -241,9 +241,9 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
                                            QString::fromLatin1("<html><head/><body>%1 "
                                                                "<a href=\"https://www.freecadweb.org/wiki/Std_DependencyGraph\">%2"
                                                                "</a><p>%3</p></body></html>")
-                                           .arg(tr("Graphviz couldn't be found on your system."))
-                                           .arg(tr("Read more about it here."))
-                                           .arg(tr("Do you want to specify its installation path if it's already installed?")),
+                                           .arg(tr("Graphviz couldn't be found on your system."),
+                                                tr("Read more about it here."),
+                                                tr("Do you want to specify its installation path if it's already installed?")),
                                            QMessageBox::Yes, QMessageBox::No);
             if (ret == QMessageBox::No) {
                 disconnectSignals();
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 7e55e83336..3d1c53a18f 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -1265,7 +1265,7 @@ QPixmap MainWindow::splashImage() const
         QString title = qApp->applicationName();
         QString major   = QString::fromLatin1(App::Application::Config()["BuildVersionMajor"].c_str());
         QString minor   = QString::fromLatin1(App::Application::Config()["BuildVersionMinor"].c_str());
-        QString version = QString::fromLatin1("%1.%2").arg(major).arg(minor);
+        QString version = QString::fromLatin1("%1.%2").arg(major, minor);
 
         std::map<std::string,std::string>::const_iterator te = App::Application::Config().find("SplashInfoExeName");
         std::map<std::string,std::string>::const_iterator tv = App::Application::Config().find("SplashInfoVersion");
@@ -1731,7 +1731,7 @@ void StatusBarObserver::OnChange(Base::Subject<const char*> &rCaller, const char
 void StatusBarObserver::Message(const char * m)
 {
     // Send the event to the main window to allow thread-safety. Qt will delete it when done.
-    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->msg).arg(QString::fromUtf8(m));
+    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->msg, QString::fromUtf8(m));
     CustomMessageEvent* ev = new CustomMessageEvent(CustomMessageEvent::Msg, txt);
     QApplication::postEvent(getMainWindow(), ev);
 }
@@ -1742,7 +1742,7 @@ void StatusBarObserver::Message(const char * m)
 void StatusBarObserver::Warning(const char *m)
 {
     // Send the event to the main window to allow thread-safety. Qt will delete it when done.
-    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->wrn).arg(QString::fromUtf8(m));
+    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->wrn, QString::fromUtf8(m));
     CustomMessageEvent* ev = new CustomMessageEvent(CustomMessageEvent::Wrn, txt);
     QApplication::postEvent(getMainWindow(), ev);
 }
@@ -1753,7 +1753,7 @@ void StatusBarObserver::Warning(const char *m)
 void StatusBarObserver::Error  (const char *m)
 {
     // Send the event to the main window to allow thread-safety. Qt will delete it when done.
-    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->err).arg(QString::fromUtf8(m));
+    QString txt = QString::fromLatin1("<font color=\"%1\">%2</font>").arg(this->err, QString::fromUtf8(m));
     CustomMessageEvent* ev = new CustomMessageEvent(CustomMessageEvent::Err, txt);
     QApplication::postEvent(getMainWindow(), ev);
 }
diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp
index f12641cf48..165fbace19 100644
--- a/src/Gui/ProgressBar.cpp
+++ b/src/Gui/ProgressBar.cpp
@@ -243,7 +243,7 @@ void Sequencer::showRemainingTime()
             QTime time( 0,0, 0);
             time = time.addSecs( rest/1000 );
             QString remain = Gui::ProgressBar::tr("Remaining: %1").arg(time.toString());
-            QString status = QString::fromLatin1("%1\t[%2]").arg(txt).arg(remain);
+            QString status = QString::fromLatin1("%1\t[%2]").arg(txt, remain);
 
             if (thr != currentThread) {
                 QMetaObject::invokeMethod(getMainWindow()->statusBar(), "showMessage",
diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp
index 67a80ee5fc..cb9d387a8f 100644
--- a/src/Gui/PythonConsole.cpp
+++ b/src/Gui/PythonConsole.cpp
@@ -468,7 +468,7 @@ PythonConsole::PythonConsole(QWidget *parent)
 #endif
     d->info = QString::fromLatin1("Python %1 on %2\n"
     "Type 'help', 'copyright', 'credits' or 'license' for more information.")
-    .arg(QString::fromLatin1(version)).arg(QString::fromLatin1(platform));
+    .arg(QString::fromLatin1(version), QString::fromLatin1(platform));
     d->output = d->info;
     printPrompt(PythonConsole::Complete);
 }
diff --git a/src/Gui/QSint/actionpanel/freecadscheme.cpp b/src/Gui/QSint/actionpanel/freecadscheme.cpp
index 7c987bbf10..0cd3d701e6 100644
--- a/src/Gui/QSint/actionpanel/freecadscheme.cpp
+++ b/src/Gui/QSint/actionpanel/freecadscheme.cpp
@@ -318,16 +318,16 @@ QString SystemPanelScheme::systemStyle(const QPalette& p) const
         "color: #006600;"                                           // todo
     "}"
   )
-  .arg(panelBackground1.name())
-  .arg(panelBackground2.name())
-  .arg(headerBackground1.name())
-  .arg(headerBackground2.name())
-  .arg(headerLabelText.name())
-  .arg(headerLabelTextOver.name())
-  .arg(groupBackground.name())
-  .arg(groupBorder.name())
-  .arg(taskLabelText.name())
-  .arg(taskLabelTextOver.name())
+          .arg(panelBackground1.name(),
+               panelBackground2.name(),
+               headerBackground1.name(),
+               headerBackground2.name(),
+               headerLabelText.name(),
+               headerLabelTextOver.name(),
+               groupBackground.name(),
+               groupBorder.name(),
+               taskLabelText.name())
+           .arg(taskLabelTextOver.name())
   ;
 
   return style;
diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp
index 7f803a8893..45a9f4a397 100644
--- a/src/Gui/Selection.cpp
+++ b/src/Gui/Selection.cpp
@@ -507,9 +507,9 @@ bool SelectionSingleton::setPreselect(const char* pDocName, const char* pObjectN
                 msg = QCoreApplication::translate("SelectionFilter","Not allowed:");
             }
             msg.append(QString::fromLatin1(" %1.%2.%3 ")
-                  .arg(QString::fromLatin1(pDocName))
-                  .arg(QString::fromLatin1(pObjectName))
-                  .arg(QString::fromLatin1(pSubName)));
+                  .arg(QString::fromLatin1(pDocName),
+                       QString::fromLatin1(pObjectName),
+                       QString::fromLatin1(pSubName)));
 
             if (getMainWindow()) {
                 getMainWindow()->showMessage(msg);
diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp
index 471dcbc00b..d5ef03ae26 100644
--- a/src/Gui/SelectionView.cpp
+++ b/src/Gui/SelectionView.cpp
@@ -256,7 +256,7 @@ void SelectionView::select(QListWidgetItem* item)
     //Gui::Selection().clearSelection();
     Gui::Command::runCommand(Gui::Command::Gui,"Gui.Selection.clearSelection()");
     //Gui::Selection().addSelection(elements[0].toLatin1(),elements[1].toLatin1(),0);
-    QString cmd = QString::fromLatin1("Gui.Selection.addSelection(App.getDocument(\"%1\").getObject(\"%2\"))").arg(elements[0]).arg(elements[1]);
+    QString cmd = QString::fromLatin1("Gui.Selection.addSelection(App.getDocument(\"%1\").getObject(\"%2\"))").arg(elements[0], elements[1]);
     Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
 }
 
@@ -270,7 +270,7 @@ void SelectionView::deselect(void)
         return;
 
     //Gui::Selection().rmvSelection(elements[0].toLatin1(),elements[1].toLatin1(),0);
-    QString cmd = QString::fromLatin1("Gui.Selection.removeSelection(App.getDocument(\"%1\").getObject(\"%2\"))").arg(elements[0]).arg(elements[1]);
+    QString cmd = QString::fromLatin1("Gui.Selection.removeSelection(App.getDocument(\"%1\").getObject(\"%2\"))").arg(elements[0], elements[1]);
     Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
 }
 
@@ -294,7 +294,7 @@ void SelectionView::touch(void)
     QStringList elements = item->data(Qt::UserRole).toStringList();
     if (elements.size() < 2)
         return;
-    QString cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").touch()").arg(elements[0]).arg(elements[1]);
+    QString cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").touch()").arg(elements[0], elements[1]);
     Gui::Command::runCommand(Gui::Command::Doc,cmd.toLatin1());
 }
 
@@ -308,7 +308,7 @@ void SelectionView::toPython(void)
         return;
 
     try {
-        QString cmd = QString::fromLatin1("obj = App.getDocument(\"%1\").getObject(\"%2\")").arg(elements[0]).arg(elements[1]);
+        QString cmd = QString::fromLatin1("obj = App.getDocument(\"%1\").getObject(\"%2\")").arg(elements[0], elements[1]);
         Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
         if (elements.length() > 2) {
             App::Document* doc = App::GetApplication().getDocument(elements[0].toLatin1());
@@ -316,17 +316,12 @@ void SelectionView::toPython(void)
             QString property = getProperty(obj);
 
             cmd = QString::fromLatin1("shp = App.getDocument(\"%1\").getObject(\"%2\").%3")
-                    .arg(elements[0])
-                    .arg(elements[1])
-                    .arg(property);
+                    .arg(elements[0], elements[1], property);
             Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
 
             if (supportPart(obj, elements[2])) {
                 cmd = QString::fromLatin1("elt = App.getDocument(\"%1\").getObject(\"%2\").%3.%4")
-                        .arg(elements[0])
-                        .arg(elements[1])
-                        .arg(property)
-                        .arg(elements[2]);
+                        .arg(elements[0], elements[1], property, elements[2]);
                 Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
             }
         }
@@ -351,11 +346,7 @@ void SelectionView::showPart(void)
             try {
                 Gui::Command::addModule(Gui::Command::Gui, module.toLatin1());
                 QString cmd = QString::fromLatin1("%1.show(App.getDocument(\"%2\").getObject(\"%3\").%4.%5)")
-                        .arg(module)
-                        .arg(elements[0])
-                        .arg(elements[1])
-                        .arg(property)
-                        .arg(elements[2]);
+                        .arg(module, elements[0], elements[1], property, elements[2]);
                 Gui::Command::runCommand(Gui::Command::Gui,cmd.toLatin1());
             }
             catch (const Base::Exception& e) {
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index 167056c115..e097a1c11b 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -475,7 +475,7 @@ void AboutDialog::setupLabels()
     ui->labelAuthor->setUrl(mturl);
 
     QString version = ui->labelBuildVersion->text();
-    version.replace(QString::fromLatin1("Unknown"), QString::fromLatin1("%1.%2").arg(major).arg(minor));
+    version.replace(QString::fromLatin1("Unknown"), QString::fromLatin1("%1.%2").arg(major, minor));
     ui->labelBuildVersion->setText(version);
 
     QString revision = ui->labelBuildRevision->text();
@@ -703,7 +703,7 @@ void AboutDialog::linkActivated(const QUrl& link)
     QString fragment = link.fragment();
     if (fragment.startsWith(QLatin1String("_Toc"))) {
         QString prefix = fragment.mid(4);
-        title = QString::fromLatin1("%1 %2").arg(prefix).arg(title);
+        title = QString::fromLatin1("%1 %2").arg(prefix, title);
     }
     licenseView->setWindowTitle(title);
     getMainWindow()->addWindow(licenseView);
diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index a64c42dc2f..756a120270 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -267,7 +267,7 @@ void TreeWidget::onCreateGroup()
         App::Document* doc = docitem->document()->getDocument();
         QString cmd = QString::fromLatin1("App.getDocument(\"%1\").addObject"
                               "(\"App::DocumentObjectGroup\",\"%2\")")
-                              .arg(QString::fromLatin1(doc->getName())).arg(name);
+                              .arg(QString::fromLatin1(doc->getName()), name);
         Gui::Document* gui = Gui::Application::Instance->getDocument(doc);
         gui->openCommand("Create group");
         Gui::Command::runCommand(Gui::Command::App, cmd.toUtf8());
@@ -280,9 +280,9 @@ void TreeWidget::onCreateGroup()
         App::Document* doc = obj->getDocument();
         QString cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\")"
                               ".newObject(\"App::DocumentObjectGroup\",\"%3\")")
-                              .arg(QString::fromLatin1(doc->getName()))
-                              .arg(QString::fromLatin1(obj->getNameInDocument()))
-                              .arg(name);
+                              .arg(QString::fromLatin1(doc->getName()),
+                                   QString::fromLatin1(obj->getNameInDocument()),
+                                   name);
         Gui::Document* gui = Gui::Application::Instance->getDocument(doc);
         gui->openCommand("Create group");
         Gui::Command::runCommand(Gui::Command::App, cmd.toUtf8());
@@ -1941,8 +1941,8 @@ void DocumentObjectItem::displayStatusInfo()
     if ( Obj->mustExecute() == 1 )
         info += QString::fromLatin1(" (but must be executed)");
     QString status = TreeWidget::tr("%1, Internal name: %2")
-            .arg(info)
-            .arg(QString::fromLatin1(Obj->getNameInDocument()));
+            .arg(info,
+                 QString::fromLatin1(Obj->getNameInDocument()));
     getMainWindow()->showMessage(status);
 
     if (Obj->isError()) {
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index e62bf4c2d8..04caf32a29 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -1861,8 +1861,7 @@ void View3DInventorViewer::printDimension()
 
         // Create final string and update window
         QString dim = QString::fromLatin1("%1 x %2")
-                      .arg(wStr)
-                      .arg(hStr);
+                      .arg(wStr, hStr);
         getMainWindow()->setPaneText(2, dim);
     }
     else
diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp
index be1f52945c..23b3f33701 100644
--- a/src/Gui/ViewProviderGroupExtension.cpp
+++ b/src/Gui/ViewProviderGroupExtension.cpp
@@ -103,9 +103,9 @@ void ViewProviderGroupExtension::extensionDropObject(App::DocumentObject* obj) {
     QString cmd;
     cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").addObject("
                         "App.getDocument(\"%1\").getObject(\"%3\"))")
-                        .arg(QString::fromLatin1(doc->getName()))
-                        .arg(QString::fromLatin1(grp->getNameInDocument()))
-                        .arg(QString::fromLatin1(obj->getNameInDocument()));
+                        .arg(QString::fromLatin1(doc->getName()),
+                             QString::fromLatin1(grp->getNameInDocument()),
+                             QString::fromLatin1(obj->getNameInDocument()));
 
     Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8());
 }
@@ -119,16 +119,16 @@ void ViewProviderGroupExtension::extensionReplaceObject(App::DocumentObject* old
     QString cmd;
     cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").removeObject("
                         "App.getDocument(\"%1\").getObject(\"%3\"))")
-                        .arg(QString::fromLatin1(doc->getName()))
-                        .arg(QString::fromLatin1(grp->getNameInDocument()))
-                        .arg(QString::fromLatin1(oldValue->getNameInDocument()));
+                        .arg(QString::fromLatin1(doc->getName()),
+                             QString::fromLatin1(grp->getNameInDocument()),
+                             QString::fromLatin1(oldValue->getNameInDocument()));
 
     Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8());
     cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").addObject("
                         "App.getDocument(\"%1\").getObject(\"%3\"))")
-                        .arg(QString::fromLatin1(doc->getName()))
-                        .arg(QString::fromLatin1(grp->getNameInDocument()))
-                        .arg(QString::fromLatin1(newValue->getNameInDocument()));
+                        .arg(QString::fromLatin1(doc->getName()),
+                             QString::fromLatin1(grp->getNameInDocument()),
+                             QString::fromLatin1(newValue->getNameInDocument()));
 
     Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8());
 }
diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp
index d09f2448be..99e3f7ef29 100644
--- a/src/Gui/WidgetFactory.cpp
+++ b/src/Gui/WidgetFactory.cpp
@@ -1237,7 +1237,7 @@ void PyResource::load(const char* name)
 
                 if (!fi.exists()) {
                     QString what = QObject::tr("Cannot find file %1 neither in %2 nor in %3")
-                        .arg(fn).arg(cwd).arg(home);
+                        .arg(fn, cwd, home);
                     throw Base::FileSystemError(what.toUtf8().constData());
                 }
                 else {
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index 9f13014df1..d93b068545 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -320,7 +320,7 @@ QString PropertyItem::pythonIdentifier(const App::Property* prop) const
         App::Document* doc = static_cast<App::Document*>(parent);
         QString docName = QString::fromLatin1(App::GetApplication().getDocumentName(doc));
         QString propName = QString::fromLatin1(parent->getPropertyName(prop));
-        return QString::fromLatin1("FreeCAD.getDocument(\"%1\").%2").arg(docName).arg(propName);
+        return QString::fromLatin1("FreeCAD.getDocument(\"%1\").%2").arg(docName, propName);
     }
     if (parent->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) {
         App::DocumentObject* obj = static_cast<App::DocumentObject*>(parent);
@@ -329,7 +329,7 @@ QString PropertyItem::pythonIdentifier(const App::Property* prop) const
         QString objName = QString::fromLatin1(obj->getNameInDocument());
         QString propName = QString::fromLatin1(parent->getPropertyName(prop));
         return QString::fromLatin1("FreeCAD.getDocument(\"%1\").getObject(\"%2\").%3")
-            .arg(docName).arg(objName).arg(propName);
+            .arg(docName, objName, propName);
     }
     auto* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(parent);
     if (vp) {
@@ -339,7 +339,7 @@ QString PropertyItem::pythonIdentifier(const App::Property* prop) const
         QString objName = QString::fromLatin1(obj->getNameInDocument());
         QString propName = QString::fromLatin1(parent->getPropertyName(prop));
         return QString::fromLatin1("FreeCADGui.getDocument(\"%1\").getObject(\"%2\").%3")
-            .arg(docName).arg(objName).arg(propName);
+            .arg(docName, objName, propName);
     }
     return QString();
 }
@@ -395,7 +395,7 @@ void PropertyItem::setPropertyValue(const QString& value)
         it != propertyItems.end(); ++it) {
         App::PropertyContainer* parent = (*it)->getContainer();
         if (parent && !parent->isReadOnly(*it) && !(*it)->testStatus(App::Property::ReadOnly)) {
-            QString cmd = QString::fromLatin1("%1 = %2").arg(pythonIdentifier(*it)).arg(value);
+            QString cmd = QString::fromLatin1("%1 = %2").arg(pythonIdentifier(*it), value);
             try {
                 Gui::Command::runCommand(Gui::Command::App, cmd.toUtf8());
             }
@@ -1144,9 +1144,9 @@ QVariant PropertyVectorItem::toString(const QVariant& prop) const
 {
     const Base::Vector3d& value = prop.value<Base::Vector3d>();
     QString data = QString::fromLatin1("[%1 %2 %3]")
-        .arg(QLocale::system().toString(value.x, 'f', 2))
-        .arg(QLocale::system().toString(value.y, 'f', 2))
-        .arg(QLocale::system().toString(value.z, 'f', 2));
+        .arg(QLocale::system().toString(value.x, 'f', 2),
+             QLocale::system().toString(value.y, 'f', 2),
+             QLocale::system().toString(value.z, 'f', 2));
     return QVariant(data);
 }
 
@@ -1183,9 +1183,9 @@ void PropertyVectorItem::setEditorData(QWidget *editor, const QVariant& data) co
     QLineEdit* le = qobject_cast<QLineEdit*>(editor);
     const Base::Vector3d& value = data.value<Base::Vector3d>();
     QString text = QString::fromLatin1("[%1 %2 %3]")
-        .arg(QLocale::system().toString(value.x, 'f', 2))
-        .arg(QLocale::system().toString(value.y, 'f', 2))
-        .arg(QLocale::system().toString(value.z, 'f', 2));
+        .arg(QLocale::system().toString(value.x, 'f', 2),
+             QLocale::system().toString(value.y, 'f', 2),
+             QLocale::system().toString(value.z, 'f', 2));
     le->setText(text);
 }
 
@@ -1443,22 +1443,22 @@ QVariant PropertyMatrixItem::toString(const QVariant& prop) const
 {
     const Base::Matrix4D& value = prop.value<Base::Matrix4D>();
     QString text = QString::fromLatin1("[%1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16]")
-        .arg(QLocale::system().toString(value[0][0], 'f', 2)) //(unsigned short usNdx)
-        .arg(QLocale::system().toString(value[0][1], 'f', 2))
-        .arg(QLocale::system().toString(value[0][2], 'f', 2))
-        .arg(QLocale::system().toString(value[0][3], 'f', 2))
-        .arg(QLocale::system().toString(value[1][0], 'f', 2))
-        .arg(QLocale::system().toString(value[1][1], 'f', 2))
-        .arg(QLocale::system().toString(value[1][2], 'f', 2))
-        .arg(QLocale::system().toString(value[1][3], 'f', 2))
-        .arg(QLocale::system().toString(value[2][0], 'f', 2))
-        .arg(QLocale::system().toString(value[2][1], 'f', 2))
-        .arg(QLocale::system().toString(value[2][2], 'f', 2))
-        .arg(QLocale::system().toString(value[2][3], 'f', 2))
-        .arg(QLocale::system().toString(value[3][0], 'f', 2))
-        .arg(QLocale::system().toString(value[3][1], 'f', 2))
-        .arg(QLocale::system().toString(value[3][2], 'f', 2))
-        .arg(QLocale::system().toString(value[3][3], 'f', 2));
+        .arg(QLocale::system().toString(value[0][0], 'f', 2), //(unsigned short usNdx)
+            QLocale::system().toString(value[0][1], 'f', 2),
+            QLocale::system().toString(value[0][2], 'f', 2),
+            QLocale::system().toString(value[0][3], 'f', 2),
+            QLocale::system().toString(value[1][0], 'f', 2),
+            QLocale::system().toString(value[1][1], 'f', 2),
+            QLocale::system().toString(value[1][2], 'f', 2),
+            QLocale::system().toString(value[1][3], 'f', 2),
+            QLocale::system().toString(value[2][0], 'f', 2))
+         .arg(QLocale::system().toString(value[2][1], 'f', 2),
+            QLocale::system().toString(value[2][2], 'f', 2),
+            QLocale::system().toString(value[2][3], 'f', 2),
+            QLocale::system().toString(value[3][0], 'f', 2),
+            QLocale::system().toString(value[3][1], 'f', 2),
+            QLocale::system().toString(value[3][2], 'f', 2),
+            QLocale::system().toString(value[3][3], 'f', 2));
     return QVariant(text);
 }
 
@@ -1517,22 +1517,22 @@ void PropertyMatrixItem::setEditorData(QWidget *editor, const QVariant& data) co
     QLineEdit* le = qobject_cast<QLineEdit*>(editor);
     const Base::Matrix4D& value = data.value<Base::Matrix4D>();
     QString text = QString::fromLatin1("[%1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15 %16]")
-        .arg(QLocale::system().toString(value[0][0], 'f', 2)) //(unsigned short usNdx)
-        .arg(QLocale::system().toString(value[0][1], 'f', 2))
-        .arg(QLocale::system().toString(value[0][2], 'f', 2))
-        .arg(QLocale::system().toString(value[0][3], 'f', 2))
-        .arg(QLocale::system().toString(value[1][0], 'f', 2))
-        .arg(QLocale::system().toString(value[1][1], 'f', 2))
-        .arg(QLocale::system().toString(value[1][2], 'f', 2))
-        .arg(QLocale::system().toString(value[1][3], 'f', 2))
-        .arg(QLocale::system().toString(value[2][0], 'f', 2))
-        .arg(QLocale::system().toString(value[2][1], 'f', 2))
-        .arg(QLocale::system().toString(value[2][2], 'f', 2))
-        .arg(QLocale::system().toString(value[2][3], 'f', 2))
-        .arg(QLocale::system().toString(value[3][0], 'f', 2))
-        .arg(QLocale::system().toString(value[3][1], 'f', 2))
-        .arg(QLocale::system().toString(value[3][2], 'f', 2))
-        .arg(QLocale::system().toString(value[3][3], 'f', 2));
+        .arg(QLocale::system().toString(value[0][0], 'f', 2), //(unsigned short usNdx)
+            QLocale::system().toString(value[0][1], 'f', 2),
+            QLocale::system().toString(value[0][2], 'f', 2),
+            QLocale::system().toString(value[0][3], 'f', 2),
+            QLocale::system().toString(value[1][0], 'f', 2),
+            QLocale::system().toString(value[1][1], 'f', 2),
+            QLocale::system().toString(value[1][2], 'f', 2),
+            QLocale::system().toString(value[1][3], 'f', 2),
+            QLocale::system().toString(value[2][0], 'f', 2))
+        .arg(QLocale::system().toString(value[2][1], 'f', 2),
+            QLocale::system().toString(value[2][2], 'f', 2),
+            QLocale::system().toString(value[2][3], 'f', 2),
+            QLocale::system().toString(value[3][0], 'f', 2),
+            QLocale::system().toString(value[3][1], 'f', 2),
+            QLocale::system().toString(value[3][2], 'f', 2),
+            QLocale::system().toString(value[3][3], 'f', 2));
     le->setText(text);
 }
 
@@ -1747,13 +1747,13 @@ void PlacementEditor::showValue(const QVariant& d)
     angle = Base::toDegrees<double>(angle);
     pos = p.getPosition();
     QString data = QString::fromUtf8("[(%1 %2 %3);%4 \xc2\xb0;(%5 %6 %7)]")
-                    .arg(QLocale::system().toString(dir.x,'f',2))
-                    .arg(QLocale::system().toString(dir.y,'f',2))
-                    .arg(QLocale::system().toString(dir.z,'f',2))
-                    .arg(QLocale::system().toString(angle,'f',2))
-                    .arg(QLocale::system().toString(pos.x,'f',2))
-                    .arg(QLocale::system().toString(pos.y,'f',2))
-                    .arg(QLocale::system().toString(pos.z,'f',2));
+                    .arg(QLocale::system().toString(dir.x,'f',2),
+                         QLocale::system().toString(dir.y,'f',2),
+                         QLocale::system().toString(dir.z,'f',2),
+                         QLocale::system().toString(angle,'f',2),
+                         QLocale::system().toString(pos.x,'f',2),
+                         QLocale::system().toString(pos.y,'f',2),
+                         QLocale::system().toString(pos.z,'f',2));
     getLabel()->setText(data);
 }
 
@@ -1948,13 +1948,13 @@ QVariant PropertyPlacementItem::toolTip(const App::Property* prop) const
     QString data = QString::fromUtf8("Axis: (%1 %2 %3)\n"
                                      "Angle: %4\n"
                                      "Position: (%5  %6  %7)")
-                    .arg(QLocale::system().toString(dir.x,'f',decimals()))
-                    .arg(QLocale::system().toString(dir.y,'f',decimals()))
-                    .arg(QLocale::system().toString(dir.z,'f',decimals()))
-                    .arg(Base::Quantity(angle, Base::Unit::Angle).getUserString())
-                    .arg(Base::Quantity(pos.x, Base::Unit::Length).getUserString())
-                    .arg(Base::Quantity(pos.y, Base::Unit::Length).getUserString())
-                    .arg(Base::Quantity(pos.z, Base::Unit::Length).getUserString());
+            .arg(QLocale::system().toString(dir.x,'f',decimals()),
+                 QLocale::system().toString(dir.y,'f',decimals()),
+                 QLocale::system().toString(dir.z,'f',decimals()),
+                 Base::Quantity(angle, Base::Unit::Angle).getUserString(),
+                 Base::Quantity(pos.x, Base::Unit::Length).getUserString(),
+                 Base::Quantity(pos.y, Base::Unit::Length).getUserString(),
+                 Base::Quantity(pos.z, Base::Unit::Length).getUserString());
     return QVariant(data);
 }
 
@@ -1967,13 +1967,13 @@ QVariant PropertyPlacementItem::toString(const QVariant& prop) const
     angle = Base::toDegrees<double>(angle);
     pos = p.getPosition();
     QString data = QString::fromUtf8("[(%1 %2 %3); %4; (%5  %6  %7)]")
-                    .arg(QLocale::system().toString(dir.x,'f',2))
-                    .arg(QLocale::system().toString(dir.y,'f',2))
-                    .arg(QLocale::system().toString(dir.z,'f',2))
-                    .arg(Base::Quantity(angle, Base::Unit::Angle).getUserString())
-                    .arg(Base::Quantity(pos.x, Base::Unit::Length).getUserString())
-                    .arg(Base::Quantity(pos.y, Base::Unit::Length).getUserString())
-                    .arg(Base::Quantity(pos.z, Base::Unit::Length).getUserString());
+            .arg(QLocale::system().toString(dir.x,'f',2),
+                 QLocale::system().toString(dir.y,'f',2),
+                 QLocale::system().toString(dir.z,'f',2),
+                 Base::Quantity(angle, Base::Unit::Angle).getUserString(),
+                 Base::Quantity(pos.x, Base::Unit::Length).getUserString(),
+                 Base::Quantity(pos.y, Base::Unit::Length).getUserString(),
+                 Base::Quantity(pos.z, Base::Unit::Length).getUserString());
     return QVariant(data);
 }
 
@@ -3429,10 +3429,7 @@ void LinkLabel::setPropertyLink(const QStringList& o)
         "<a href=\"%1.%2\"><span style=\" text-decoration: underline; color:%3;\">%4</span></a>"
         "</p></body></html>"
     )
-    .arg(link[0])
-    .arg(link[1])
-    .arg(linkcolor)
-    .arg(link[2]);
+    .arg(link[0], link[1], linkcolor, link[2]);
     label->setText(text);
 }
 
@@ -3535,7 +3532,7 @@ void PropertyLinkItem::setValue(const QVariant& value)
         if ( o.isEmpty() )
             data = QString::fromLatin1("None");
         else
-            data = QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d).arg(o);
+            data = QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d, o);
         setPropertyValue(data);
     }
 }
@@ -3719,7 +3716,7 @@ void PropertyLinkListItem::setValue(const QVariant& value)
         QString d = list[0];
         QString o = list[1];
         if (!o.isEmpty())
-            data << QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d).arg(o);
+            data << QString::fromLatin1("App.getDocument('%1').getObject('%2')").arg(d, o);
     }
 
     setPropertyValue(QString::fromLatin1("[%1]").arg(data.join(QString::fromLatin1(", "))));
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index 21e19174ed..9a332c1a90 100644
--- a/src/Main/MainGui.cpp
+++ b/src/Main/MainGui.cpp
@@ -241,15 +241,15 @@ int main( int argc, char ** argv )
         msg = QObject::tr("While initializing %1 the following exception occurred: '%2'\n\n"
                           "Python is searching for its files in the following directories:\n%3\n\n"
                           "Python version information:\n%4\n")
-                          .arg(appName).arg(QString::fromUtf8(e.what()))
+                          .arg(appName, QString::fromUtf8(e.what()),
 #if PY_MAJOR_VERSION >= 3
 #if PY_MINOR_VERSION >= 5
-                          .arg(QString::fromUtf8(Py_EncodeLocale(Py_GetPath(),NULL))).arg(QString::fromLatin1(Py_GetVersion()));
+                          QString::fromUtf8(Py_EncodeLocale(Py_GetPath(),NULL)), QString::fromLatin1(Py_GetVersion()));
 #else
-                          .arg(QString::fromUtf8(_Py_wchar2char(Py_GetPath(),NULL))).arg(QString::fromLatin1(Py_GetVersion()));
+                          QString::fromUtf8(_Py_wchar2char(Py_GetPath(),NULL)), QString::fromLatin1(Py_GetVersion()));
 #endif
 #else
-                          .arg(QString::fromUtf8(Py_GetPath())).arg(QString::fromLatin1(Py_GetVersion()));
+                          QString::fromUtf8(Py_GetPath()), QString::fromLatin1(Py_GetVersion()));
 #endif
         const char* pythonhome = getenv("PYTHONHOME");
         if (pythonhome) {
diff --git a/src/Mod/Drawing/Gui/DrawingView.cpp b/src/Mod/Drawing/Gui/DrawingView.cpp
index efdae6c781..d46ed8c55b 100644
--- a/src/Mod/Drawing/Gui/DrawingView.cpp
+++ b/src/Mod/Drawing/Gui/DrawingView.cpp
@@ -455,8 +455,8 @@ void DrawingView::onRelabel(Gui::Document *pDoc)
 {
     if (!bIsPassive && pDoc) {
         QString cap = QString::fromLatin1("%1 : %2[*]")
-            .arg(QString::fromUtf8(pDoc->getDocument()->Label.getValue()))
-            .arg(objectName());
+            .arg(QString::fromUtf8(pDoc->getDocument()->Label.getValue()),
+                 objectName());
         setWindowTitle(cap);
     }
 }
diff --git a/src/Mod/Image/Gui/ImageView.cpp b/src/Mod/Image/Gui/ImageView.cpp
index e7e30cc970..8010cb8997 100644
--- a/src/Mod/Image/Gui/ImageView.cpp
+++ b/src/Mod/Image/Gui/ImageView.cpp
@@ -540,7 +540,7 @@ QString ImageView::createStatusBarText()
                   .arg(tr("zoom")).arg(zoomFactor,0,'f',1);
         else
             txt = QString::fromLatin1("x,y = %1  |  %2 = %3")
-                  .arg(tr("outside image")).arg(tr("zoom")).arg(zoomFactor,0,'f',1);
+                  .arg(tr("outside image"), tr("zoom")).arg(zoomFactor,0,'f',1);
     }
     else if ((colorFormat == IB_CF_RGB24) || 
              (colorFormat == IB_CF_RGB48))
@@ -550,7 +550,7 @@ QString ImageView::createStatusBarText()
             (_pGLImageBox->getImageSample(pixX, pixY, 1, green) != 0) ||
             (_pGLImageBox->getImageSample(pixX, pixY, 2, blue) != 0))
             txt = QString::fromLatin1("x,y = %1  |  %2 = %3")
-                  .arg(tr("outside image")).arg(tr("zoom")).arg(zoomFactor,0,'f',1);
+                  .arg(tr("outside image"), tr("zoom")).arg(zoomFactor,0,'f',1);
         else
             txt = QString::fromLatin1("x,y = %1,%2  |  rgb = %3,%4,%5  |  %6 = %7")
                   .arg(icX,0,'f',2).arg(icY,0,'f',2)
@@ -565,7 +565,7 @@ QString ImageView::createStatusBarText()
             (_pGLImageBox->getImageSample(pixX, pixY, 1, green) != 0) ||
             (_pGLImageBox->getImageSample(pixX, pixY, 2, red) != 0))
             txt = QString::fromLatin1("x,y = %1  |  %2 = %3")
-                  .arg(tr("outside image")).arg(tr("zoom")).arg(zoomFactor,0,'f',1);
+                  .arg(tr("outside image"), tr("zoom")).arg(zoomFactor,0,'f',1);
         else
             txt = QString::fromLatin1("x,y = %1,%2  |  rgb = %3,%4,%5  |  %6 = %7")
                   .arg(icX,0,'f',2).arg(icY,0,'f',2)
@@ -581,7 +581,7 @@ QString ImageView::createStatusBarText()
             (_pGLImageBox->getImageSample(pixX, pixY, 2, blue) != 0) ||
             (_pGLImageBox->getImageSample(pixX, pixY, 3, alpha) != 0))
             txt = QString::fromLatin1("x,y = %1  |  %2 = %3")
-                  .arg(tr("outside image")).arg(tr("zoom")).arg(zoomFactor,0,'f',1);
+                  .arg(tr("outside image"), tr("zoom")).arg(zoomFactor,0,'f',1);
         else
             txt = QString::fromLatin1("x,y = %1,%2  |  rgba = %3,%4,%5,%6  |  %7 = %8")
                   .arg(icX,0,'f',2).arg(icY,0,'f',2)
@@ -597,7 +597,7 @@ QString ImageView::createStatusBarText()
             (_pGLImageBox->getImageSample(pixX, pixY, 2, red) != 0) ||
             (_pGLImageBox->getImageSample(pixX, pixY, 3, alpha) != 0))
             txt = QString::fromLatin1("x,y = %1  |  %2 = %3")
-                  .arg(tr("outside image")).arg(tr("zoom")).arg(zoomFactor,0,'f',1);
+                  .arg(tr("outside image"), tr("zoom")).arg(zoomFactor,0,'f',1);
         else
             txt = QString::fromLatin1("x,y = %1,%2  |  rgba = %3,%4,%5,%6  |  %7 = %8")
                   .arg(icX,0,'f',2).arg(icY,0,'f',2)
diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
index 7fd8dd2f5b..f47eda3b1e 100644
--- a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
@@ -68,8 +68,8 @@ void DlgPartImportIgesImp::onChooseFileName()
 {
     QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::null, QString::null,
         QString::fromLatin1("%1 (*.igs *.iges);;%2 (*.*)"))
-        .arg(tr("IGES"))
-        .arg(tr("All Files"));
+        .arg(tr("IGES"),
+             tr("All Files"));
     if (!fn.isEmpty()) {
         FileName->setText(fn);
     }
diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
index 02d2a1956d..4053d05cfd 100644
--- a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
@@ -67,8 +67,8 @@ void DlgPartImportStepImp::onChooseFileName()
 {
     QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::null, QString::null,
         QString::fromLatin1("%1 (*.stp *.step);;%2 (*.*)"))
-        .arg(tr("STEP"))
-        .arg(tr("All Files"));
+        .arg(tr("STEP"),
+             tr("All Files"));
     if (!fn.isEmpty()) {
         FileName->setText(fn);
     }
diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp
index 0233518b34..f593b273de 100644
--- a/src/Mod/Points/Gui/Command.cpp
+++ b/src/Mod/Points/Gui/Command.cpp
@@ -76,7 +76,7 @@ void CmdPointsImport::activated(int iMsg)
 
     QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(),
       QString::null, QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)")
-      .arg(QObject::tr("Point formats")).arg(QObject::tr("All Files")));
+      .arg(QObject::tr("Point formats"), QObject::tr("All Files")));
     if (fn.isEmpty())
         return;
 
@@ -126,7 +126,7 @@ void CmdPointsExport::activated(int iMsg)
     for (std::vector<App::DocumentObject*>::const_iterator it = points.begin(); it != points.end(); ++it) {
         QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(),
           QString::null, QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)")
-          .arg(QObject::tr("Point formats")).arg(QObject::tr("All Files")));
+          .arg(QObject::tr("Point formats"), QObject::tr("All Files")));
         if (fn.isEmpty())
             break;
 
diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
index a8bb88dd2a..7a9ea62171 100644
--- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
+++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
@@ -159,8 +159,7 @@ bool FitBSplineSurfaceWidget::accept()
         }
         QString command = QString::fromLatin1("%1.addObject(\"Part::Spline\", \"Spline\").Shape = "
             "ReverseEngineering.approxSurface(%2).toShape()")
-            .arg(document)
-            .arg(argument)
+            .arg(document, argument)
             ;
 
         Gui::WaitCursor wc;
diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.cpp b/src/Mod/ReverseEngineering/Gui/Poisson.cpp
index 3bdcfbdd22..8364318dbd 100644
--- a/src/Mod/ReverseEngineering/Gui/Poisson.cpp
+++ b/src/Mod/ReverseEngineering/Gui/Poisson.cpp
@@ -93,8 +93,7 @@ bool PoissonWidget::accept()
             ;
         QString command = QString::fromLatin1("%1.addObject(\"Mesh::Feature\", \"Poisson\").Mesh = "
             "ReverseEngineering.poissonReconstruction(%2)")
-            .arg(document)
-            .arg(argument)
+            .arg(document, argument)
             ;
 
         Gui::WaitCursor wc;
diff --git a/src/Mod/Robot/Gui/Workbench.cpp b/src/Mod/Robot/Gui/Workbench.cpp
index 1739f7e6a2..048c492cb7 100644
--- a/src/Mod/Robot/Gui/Workbench.cpp
+++ b/src/Mod/Robot/Gui/Workbench.cpp
@@ -80,9 +80,9 @@ 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(dir)
+                    .arg(QString::fromLatin1(
+                             "https://github.com/FreeCAD/FreeCAD/tree/master"
+                             "/src/Mod/Robot/Lib/Kuka"), dir)
         );
         wc.setWaitCursor();
     }