diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-26 14:49:52 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-09-28 15:48:16 +0000 |
| commit | a1c4d563a19f464969407ccdb1f3e5b79da25c55 (patch) | |
| tree | 0f9cf8849a5eb633e63f1decbf027991b0e66fd2 /src/plugins/diffeditor/diffutils.cpp | |
| parent | cd8ff54b008d775df19a607f203ef2ac1655d4bc (diff) | |
| download | qt-creator-a1c4d563a19f464969407ccdb1f3e5b79da25c55.tar.gz | |
DiffEditor: Use DiffSide enum inside RowData
Change-Id: I5511e443e2f76a1dab5cc78eec5faec04ee31bcc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index 1dbaf6c73c..c3dde260f4 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -294,9 +294,9 @@ FileData DiffUtils::calculateContextData(const ChunkData &originalData, int cont break; RowData rowData = originalData.rows.at(i); chunkData.rows.append(rowData); - if (rowData.leftLine.textLineType == TextLineData::TextLine) + if (rowData.line[LeftSide].textLineType == TextLineData::TextLine) ++leftLineNumber; - if (rowData.rightLine.textLineType == TextLineData::TextLine) + if (rowData.line[RightSide].textLineType == TextLineData::TextLine) ++rightLineNumber; ++i; } @@ -351,15 +351,15 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, int i = 0; for (i = rowCount; i > 0; i--) { const RowData &rowData = chunkData.rows.at(i - 1); - if (rowData.leftLine.textLineType != TextLineData::Separator - || rowData.rightLine.textLineType != TextLineData::TextLine) + if (rowData.line[LeftSide].textLineType != TextLineData::Separator + || rowData.line[RightSide].textLineType != TextLineData::TextLine) break; } const int leftSeparator = i; for (i = rowCount; i > 0; i--) { const RowData &rowData = chunkData.rows.at(i - 1); - if (rowData.rightLine.textLineType != TextLineData::Separator - || rowData.leftLine.textLineType != TextLineData::TextLine) + if (rowData.line[RightSide].textLineType != TextLineData::Separator + || rowData.line[LeftSide].textLineType != TextLineData::TextLine) break; } const int rightSeparator = i; @@ -409,7 +409,7 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, } if (i < chunkData.rows.size()) { const QString line = makePatchLine(' ', - rowData.rightLine.text, + rowData.line[RightSide].text, lastChunk, i == chunkData.rows.size() - 1); @@ -421,10 +421,10 @@ QString DiffUtils::makePatch(const ChunkData &chunkData, diffText += line; } } else { - if (rowData.leftLine.textLineType == TextLineData::TextLine) - leftBuffer.append(rowData.leftLine); - if (rowData.rightLine.textLineType == TextLineData::TextLine) - rightBuffer.append(rowData.rightLine); + if (rowData.line[LeftSide].textLineType == TextLineData::TextLine) + leftBuffer.append(rowData.line[LeftSide]); + if (rowData.line[RightSide].textLineType == TextLineData::TextLine) + rightBuffer.append(rowData.line[RightSide]); } } |