From e6969cfa055c6fd7ca93f07aff617a192fdc4fd8 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 2 Nov 2021 18:14:28 +0100 Subject: [PATCH] MergeTool: use multiarg arg() Change-Id: If3859509dae9f44ab54ad50491a42f09e5e3a94b Reviewed-by: Orgad Shaneh --- src/plugins/git/mergetool.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index c6f451d8e35..6343c408f2b 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -154,11 +154,9 @@ void MergeTool::chooseAction() msgBox.setIcon(QMessageBox::Question); msgBox.setStandardButtons(QMessageBox::Abort); msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4") - .arg(mergeTypeName()) - .arg(m_fileName) - .arg(stateName(m_localState, m_localInfo)) - .arg(stateName(m_remoteState, m_remoteInfo)) - ); + .arg(mergeTypeName(), m_fileName, + stateName(m_localState, m_localInfo), + stateName(m_remoteState, m_remoteInfo))); switch (m_mergeType) { case SubmoduleMerge: case SymbolicLinkMerge: