From b2b8b867d68e95e9421a15549c1a7bb83949186d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 30 Jan 2015 16:59:25 +0100 Subject: DiffEditor: Refactor the user-facing parts * Move all data handling into DiffEditorDocument * Move much of the logic of how to update views into the DiffEditor. * Introduce a base class for the different views on the diff to implement. * Remove DiffEditorGuiController * Make DiffEditorController smaller and merge the DiffEditorReloader into the class * Simplify communication between the classes involved * Make much of the implementation private to the plugin Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7 Reviewed-by: Orgad Shaneh Reviewed-by: Jarek Kobus --- src/plugins/diffeditor/diffutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/diffeditor/diffutils.h') diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index f902ba484c..f5f969c6d2 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -138,7 +138,7 @@ public: static ChunkData calculateOriginalData(const QList &leftDiffList, const QList &rightDiffList); static FileData calculateContextData(const ChunkData &originalData, - int contextLinesNumber, + int contextLineCount, int joinChunkThreshold = 1); static QString makePatchLine(const QChar &startLineCharacter, const QString &textLine, -- cgit v1.2.1