feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Limit the usage of qMakePair

Browse Source 
Change-Id: I0f7f4235cba4e1f6df4245cb51a37ff82a8e5109
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-30 09:09:06 +02:00
parent 38316079f3
commit 1359557f77
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/differ.cpp
View File

@@ -537,10 +537,8 @@ static QString encodeExpandedWhitespace(const QString &leftEquality,
const int replacementPosition = output.count(); const int replacementPosition = output.count();
const int replacementSize = qMax(leftWhitespaces.count(), rightWhitespaces.count()); const int replacementSize = qMax(leftWhitespaces.count(), rightWhitespaces.count());
const QString replacement(replacementSize, ' '); const QString replacement(replacementSize, ' ');
leftCodeMap->insert(replacementPosition, leftCodeMap->insert(replacementPosition, {replacementSize, leftWhitespaces});
qMakePair(replacementSize, leftWhitespaces)); rightCodeMap->insert(replacementPosition, {replacementSize, rightWhitespaces});
rightCodeMap->insert(replacementPosition,
qMakePair(replacementSize, rightWhitespaces));
output.append(replacement); output.append(replacement);
} }

4
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -416,8 +416,8 @@ void DiffEditor::prepareForReload()
if (m_entriesComboBox->count() > 0) { if (m_entriesComboBox->count() > 0) {
m_currentFileChunk m_currentFileChunk
= qMakePair(m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole).toString(), = {m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole).toString(),
m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole + 1).toString()); m_entriesComboBox->itemData(m_currentDiffFileIndex, Qt::UserRole + 1).toString()};
} else { } else {
m_currentFileChunk = {}; m_currentFileChunk = {};
} }

10
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -193,8 +193,8 @@ void UnifiedDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
if (currentChunkIndex > chunkIndex) if (currentChunkIndex > chunkIndex)
break; break;
const int leftRow = m_data.m_lineNumbers[LeftSide].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, qMakePair(-1, -1)).second; const int rightRow = m_data.m_lineNumbers[RightSide].value(i, {-1, -1}).second;
if (leftRow >= 0) if (leftRow >= 0)
leftSelection.append(leftRow); leftSelection.append(leftRow);
@@ -288,7 +288,7 @@ void UnifiedDiffData::setLineNumber(DiffSide side, int blockNumber, int lineNumb
{ {
QTC_ASSERT(side < SideCount, return); QTC_ASSERT(side < SideCount, return);
const QString lineNumberString = QString::number(lineNumber); 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()); 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 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) { if (rightLineNumber >= 0) {
m_controller.jumpToOriginalFile(rightFileName, rightLineNumber, columnNumber); m_controller.jumpToOriginalFile(rightFileName, rightLineNumber, columnNumber);
return; 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) if (leftLineNumber < 0)
return; return;
if (leftFileName != rightFileName) { if (leftFileName != rightFileName) {