From 1359557f77a767490af96ca85cdc5ce12506c3d2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 30 Sep 2022 09:09:06 +0200 Subject: [PATCH] DiffEditor: Limit the usage of qMakePair Change-Id: I0f7f4235cba4e1f6df4245cb51a37ff82a8e5109 Reviewed-by: Orgad Shaneh --- src/libs/utils/differ.cpp | 6 ++---- src/plugins/diffeditor/diffeditor.cpp | 4 ++-- src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp index d71e18f4935..8c37d420e7b 100644 --- a/src/libs/utils/differ.cpp +++ b/src/libs/utils/differ.cpp @@ -537,10 +537,8 @@ static QString encodeExpandedWhitespace(const QString &leftEquality, const int replacementPosition = output.count(); const int replacementSize = qMax(leftWhitespaces.count(), rightWhitespaces.count()); const QString replacement(replacementSize, ' '); - leftCodeMap->insert(replacementPosition, - qMakePair(replacementSize, leftWhitespaces)); - rightCodeMap->insert(replacementPosition, - qMakePair(replacementSize, rightWhitespaces)); + leftCodeMap->insert(replacementPosition, {replacementSize, leftWhitespaces}); + rightCodeMap->insert(replacementPosition, {replacementSize, rightWhitespaces}); output.append(replacement); } diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index bfcf077efd5..92540f6f078 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -416,8 +416,8 @@ void DiffEditor::prepareForReload() if (m_entriesComboBox->count() > 0) { m_currentFileChunk - = qMakePair(m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole).toString(), - m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole + 1).toString()); + = {m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole).toString(), + m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole + 1).toString()}; } else { m_currentFileChunk = {}; } diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 172688bf754..1c9a83a93bc 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -193,8 +193,8 @@ void UnifiedDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e) if (currentChunkIndex > chunkIndex) break; - const int leftRow = m_data.m_lineNumbers[LeftSide].value(i, qMakePair(-1, -1)).second; - const int rightRow = m_data.m_lineNumbers[RightSide].value(i, qMakePair(-1, -1)).second; + const int leftRow = m_data.m_lineNumbers[LeftSide].value(i, {-1, -1}).second; + const int rightRow = m_data.m_lineNumbers[RightSide].value(i, {-1, -1}).second; if (leftRow >= 0) leftSelection.append(leftRow); @@ -288,7 +288,7 @@ void UnifiedDiffData::setLineNumber(DiffSide side, int blockNumber, int lineNumb { QTC_ASSERT(side < SideCount, return); const QString lineNumberString = QString::number(lineNumber); - m_lineNumbers[side].insert(blockNumber, qMakePair(lineNumber, rowNumberInChunk)); + m_lineNumbers[side].insert(blockNumber, {lineNumber, rowNumberInChunk}); m_lineNumberDigits[side] = qMax(m_lineNumberDigits[side], lineNumberString.count()); } @@ -579,13 +579,13 @@ void UnifiedDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor) const int columnNumber = cursor.positionInBlock() - 1; // -1 for the first character in line - const int rightLineNumber = m_data.m_lineNumbers[RightSide].value(blockNumber, qMakePair(-1, 0)).first; + const int rightLineNumber = m_data.m_lineNumbers[RightSide].value(blockNumber, {-1, 0}).first; if (rightLineNumber >= 0) { m_controller.jumpToOriginalFile(rightFileName, rightLineNumber, columnNumber); return; } - const int leftLineNumber = m_data.m_lineNumbers[LeftSide].value(blockNumber, qMakePair(-1, 0)).first; + const int leftLineNumber = m_data.m_lineNumbers[LeftSide].value(blockNumber, {-1, 0}).first; if (leftLineNumber < 0) return; if (leftFileName != rightFileName) {