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

Rename some methods and variables in DiffEditor

Browse Source 
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-07-07 10:23:11 +02:00
committed by Jarek Kobus
parent 91e4271069
commit 5ebd59d12b
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -108,7 +108,7 @@ void SimpleDiffEditorReloader::reload()
QList<Diff> outputLeftDiffList;
QList<Diff> outputRightDiffList;
if (diffEditorController()->isIgnoreWhitespace()) {
if (controller()->isIgnoreWhitespace()) {
const QList<Diff> leftIntermediate =
Differ::moveWhitespaceIntoEqualities(leftDiffList);
const QList<Diff> rightIntermediate =
@@ -125,14 +125,14 @@ void SimpleDiffEditorReloader::reload()
const ChunkData chunkData = DiffUtils::calculateOriginalData(
outputLeftDiffList, outputRightDiffList);
FileData fileData = DiffUtils::calculateContextData(
chunkData, diffEditorController()->contextLinesNumber(), 0);
chunkData, controller()->contextLinesNumber(), 0);
fileData.leftFileInfo.fileName = m_leftFileName;
fileData.rightFileInfo.fileName = m_rightFileName;
QList<FileData> fileDataList;
fileDataList << fileData;
diffEditorController()->setDiffFiles(fileDataList);
controller()->setDiffFiles(fileDataList);
reloadFinished();
}