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

Add autotests for diff editor

Browse Source 
Change-Id: I46c1d5c623b0ffd8c0dc16d218094d05c9975ea5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
jkobus
2013-03-12 12:17:59 +01:00
committed by hjk
parent 281b2332d2
commit 2433ee7da0
6 changed files with 506 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,10 @@ public:
QString text;
Diff(Command com, const QString &txt);
Diff();
bool operator==(const Diff &other) const;
bool operator!=(const Diff &other) const;
QString toString() const;
static QString commandString(Command com);
};
class DIFFEDITOR_EXPORT Differ
@@ -67,13 +71,13 @@ public:
QList<Diff> diff(const QString &text1, const QString &text2);
void setDiffMode(DiffMode mode);
bool diffMode() const;
QList<Diff> merge(const QList<Diff> &diffList);
private:
QList<Diff> preprocess1AndDiff(const QString &text1, const QString &text2);
QList<Diff> preprocess2AndDiff(const QString &text1, const QString &text2);
QList<Diff> diffMyers(const QString &text1, const QString &text2);
QList<Diff> diffMyersSplit(const QString &text1, int x,
const QString &text2, int y);
QList<Diff> merge(const QList<Diff> &diffList);
QList<Diff> squashEqualities(const QList<Diff> &diffList);
QList<Diff> diffNonCharMode(const QString text1, const QString text2);
QStringList encode(const QString &text1,