diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-04-23 13:16:52 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-04-23 14:33:33 +0200 |
| commit | 5f5b7fa4c18fc68467fab8203ec444896ae533aa (patch) | |
| tree | 69a306323b4260756acb3e9e151cfe33e7f484cf /src/plugins/diffeditor/diffeditorwidget.cpp | |
| parent | 3ab78b34599675bfd37ca68f9d81418a79801d59 (diff) | |
| download | qt-creator-5f5b7fa4c18fc68467fab8203ec444896ae533aa.tar.gz | |
Remove unused variables
Remove unused fields and one virtual method,
rename alwaysShows -> contextChunk and revert
its logical value.
Change-Id: I11fd60202aa5b7978b772764a40c99029cac82a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp index 4285819359..4e9da47b97 100644 --- a/src/plugins/diffeditor/diffeditorwidget.cpp +++ b/src/plugins/diffeditor/diffeditorwidget.cpp @@ -641,7 +641,7 @@ FileData DiffEditorWidget::calculateContextData(const ChunkData &originalData) c ChunkData chunkData; int leftOffset = leftCharCounter; int rightOffset = rightCharCounter; - chunkData.alwaysShown = true; + chunkData.contextChunk = false; while (i < originalData.rows.count()) { if (hiddenRows.contains(i)) break; @@ -675,7 +675,7 @@ FileData DiffEditorWidget::calculateContextData(const ChunkData &originalData) c fileData.chunks.append(chunkData); } else { ChunkData chunkData; - chunkData.alwaysShown = false; + chunkData.contextChunk = true; while (i < originalData.rows.count()) { if (!hiddenRows.contains(i)) break; @@ -719,10 +719,8 @@ void DiffEditorWidget::showDiff() QChar separator = QLatin1Char('\n'); for (int i = 0; i < m_contextFileData.chunks.count(); i++) { ChunkData chunkData = m_contextFileData.chunks.at(i); - if (!chunkData.alwaysShown) { + if (chunkData.contextChunk) { const int skippedLines = chunkData.rows.count(); -// leftLineNumber += skippedLines; -// rightLineNumber += skippedLines; m_leftEditor->setSkippedLines(blockNumber, skippedLines); m_rightEditor->setSkippedLines(blockNumber, skippedLines); m_leftEditor->setSeparator(blockNumber, true); @@ -769,7 +767,7 @@ void DiffEditorWidget::showDiff() blockNumber = 0; for (int i = 0; i < m_contextFileData.chunks.count(); i++) { ChunkData chunkData = m_contextFileData.chunks.at(i); - if (!chunkData.alwaysShown) { + if (chunkData.contextChunk) { blockNumber++; QTextBlock leftBlock = m_leftEditor->document()->findBlockByNumber(blockNumber); for (int j = 0; j < chunkData.rows.count(); j++) { @@ -787,7 +785,7 @@ void DiffEditorWidget::showDiff() blockNumber = 0; for (int i = 0; i < m_contextFileData.chunks.count(); i++) { ChunkData chunkData = m_contextFileData.chunks.at(i); - if (!chunkData.alwaysShown) { + if (chunkData.contextChunk) { QTextBlock leftBlock = m_leftEditor->document()->findBlockByNumber(blockNumber); TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(leftBlock, false); QTextBlock rightBlock = m_rightEditor->document()->findBlockByNumber(blockNumber); @@ -889,7 +887,7 @@ void DiffEditorWidget::colorDiff(const FileData &fileData) for (int i = 0; i < fileData.chunks.count(); i++) { ChunkData chunkData = fileData.chunks.at(i); - if (!chunkData.alwaysShown) { + if (chunkData.contextChunk) { leftChunkPos[leftPos] = leftPos + 1; rightChunkPos[rightPos] = rightPos + 1; leftPos++; // for chunk line |