diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-30 09:09:06 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-30 07:42:00 +0000 |
commit | 1359557f77a767490af96ca85cdc5ce12506c3d2 (patch) | |
tree | af5c652cf405e1462df6d2ba5efff62d77964163 /src/plugins/diffeditor/unifieddiffeditorwidget.cpp | |
parent | 38316079f3f9505b7ee92689a63331030d42c731 (diff) | |
download | qt-creator-1359557f77a767490af96ca85cdc5ce12506c3d2.tar.gz |
DiffEditor: Limit the usage of qMakePair
Change-Id: I0f7f4235cba4e1f6df4245cb51a37ff82a8e5109
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/unifieddiffeditorwidget.cpp')
-rw-r--r-- | src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 172688bf75..1c9a83a93b 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) { |