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/diffutils.cpp | |
| parent | b4390a3a80cf20957ac1b54545b85de07c659ebb (diff) | |
DiffEditor: Use DiffSide enum inside ChunkData
Change-Id: Ic10fe9faa6b6ccefcbf4c062663dedefa6bf5872
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index d12b34b6c21..1dbaf6c73c3 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -288,8 +288,7 @@ FileData DiffUtils::calculateContextData(const ChunkData &originalData, int cont const bool contextChunk = hiddenRows.contains(i); ChunkData chunkData; chunkData.contextChunk = contextChunk; - chunkData.leftStartingLineNumber = leftLineNumber; - chunkData.rightStartingLineNumber = rightLineNumber; + chunkData.startingLineNumber = {leftLineNumber, rightLineNumber}; while (i < originalData.rows.size()) { if (contextChunk != hiddenRows.contains(i)) break; @@ -430,11 +429,11 @@ QString DiffUtils::makePatch(const ChunkData &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) + " @@" @@ -778,8 +777,7 @@ static bool detectChunkData(QStringView chunkDiff, ChunkData *chunkData, QString if (!ok) return false; - chunkData->leftStartingLineNumber = leftLineNumber - 1; - chunkData->rightStartingLineNumber = rightLineNumber - 1; + chunkData->startingLineNumber = {leftLineNumber - 1, rightLineNumber - 1}; chunkData->contextInfo = optionalHint.toString(); return true; |