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

Add cleanupSemantics method, produce nicer diff output

Browse Source 
Change-Id: I877e06c930c219ad23af4b7c6078d8c8db3706e9
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
jkobus
2013-03-13 13:42:26 +01:00
committed by Jarek Kobus
parent e7cb32d621
commit 41fa8c3528
4 changed files with 345 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/differ.h
View File

@@ -72,6 +72,8 @@ public:
void setDiffMode(DiffMode mode);
bool diffMode() const;
QList<Diff> merge(const QList<Diff> &diffList);
QList<Diff> cleanupSemantics(const QList<Diff> &diffList);
private:
QList<Diff> preprocess1AndDiff(const QString &text1, const QString &text2);
QList<Diff> preprocess2AndDiff(const QString &text1, const QString &text2);
@@ -93,6 +95,8 @@ private:
int subTextStart);
int commonPrefix(const QString &text1, const QString &text2) const;
int commonSuffix(const QString &text1, const QString &text2) const;
int commonOverlap(const QString &text1, const QString &text2) const;
QList<Diff> cleanupOverlaps(const QList<Diff> &diffList);
DiffMode m_diffMode;
DiffMode m_currentDiffMode;
};