diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-26 14:15:40 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-28 15:48:08 +0000 |
| commit | cd8ff54b008d775df19a607f203ef2ac1655d4bc (patch) | |
| tree | ebbb3b89e9003d6e7a9faf2d6a80044db360614b /src/plugins/diffeditor/unifieddiffeditorwidget.cpp | |
| parent | b4390a3a80cf20957ac1b54545b85de07c659ebb (diff) | |
| download | qt-creator-cd8ff54b008d775df19a607f203ef2ac1655d4bc.tar.gz | |
DiffEditor: Use DiffSide enum inside ChunkData
Change-Id: Ic10fe9faa6b6ccefcbf4c062663dedefa6bf5872
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/unifieddiffeditorwidget.cpp')
| -rw-r--r-- | src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index a3b6282eba..fcd52c6d91 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -362,7 +362,7 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData if (!line.isEmpty()) { setLineNumber(LeftSide, *blockNumber + blockCount + 1, - chunkData.leftStartingLineNumber + leftLineCount + 1, + chunkData.startingLineNumber[LeftSide] + leftLineCount + 1, leftRowsBuffer.at(j)); blockCount += blockDelta; ++leftLineCount; @@ -404,7 +404,7 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData if (!line.isEmpty()) { setLineNumber(RightSide, *blockNumber + blockCount + 1, - chunkData.rightStartingLineNumber + rightLineCount + 1, + chunkData.startingLineNumber[RightSide] + rightLineCount + 1, rightRowsBuffer.at(j)); blockCount += blockDelta; ++rightLineCount; @@ -425,9 +425,9 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData if (!line.isEmpty()) { setLineNumber(LeftSide, *blockNumber + blockCount + 1, - chunkData.leftStartingLineNumber + leftLineCount + 1, i); + chunkData.startingLineNumber[LeftSide] + leftLineCount + 1, i); setLineNumber(RightSide, *blockNumber + blockCount + 1, - chunkData.rightStartingLineNumber + rightLineCount + 1, i); + chunkData.startingLineNumber[RightSide] + rightLineCount + 1, i); blockCount += line.count('\n'); ++leftLineCount; ++rightLineCount; @@ -450,11 +450,11 @@ QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData } const QString chunkLine = "@@ -" - + QString::number(chunkData.leftStartingLineNumber + 1) + + QString::number(chunkData.startingLineNumber[LeftSide] + 1) + ',' + QString::number(leftLineCount) + " +" - + QString::number(chunkData.rightStartingLineNumber+ 1) + + QString::number(chunkData.startingLineNumber[RightSide]+ 1) + ',' + QString::number(rightLineCount) + " @@" @@ -688,8 +688,8 @@ void UnifiedDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor) if (leftFileName == rightFileName) { for (const ChunkData &chunkData : fileData.chunks) { - int newLeftLineNumber = chunkData.leftStartingLineNumber; - int newRightLineNumber = chunkData.rightStartingLineNumber; + int newLeftLineNumber = chunkData.startingLineNumber[LeftSide]; + int newRightLineNumber = chunkData.startingLineNumber[RightSide]; for (const RowData &rowData : chunkData.rows) { if (rowData.leftLine.textLineType == TextLineData::TextLine) |