1 #ifndef __libquark_diff_DiffModel_hxx 2 #define __libquark_diff_DiffModel_hxx 5 #include <QScopedPointer> 34 void diff2(
const QString& baseText,
const QString& yoursText);
39 void diff3(
const QString& theirsText,
const QString& baseText,
40 const QString& yoursText);
45 { _theirsConflictMarker = marker; }
50 { _baseConflictMarker = marker; }
55 { _yoursConflictMarker = marker; }
60 { _endConflictMarker = marker; }
95 QTextStream& stream)
const;
98 { _recursiveDiff = recursiveDiff; }
101 { _aggressiveMerge = aggressiveMerge; }
116 QTextStream& stream)
const;
118 QScopedPointer<DiffResult> _diffResult;
122 QString _theirsConflictMarker;
123 QString _baseConflictMarker;
124 QString _yoursConflictMarker;
125 QString _endConflictMarker;
127 bool _aggressiveMerge;
135 #endif // __libquark_diff_DiffModel_hxx void setEndConflictMarker(const QString &marker)
Definition: DiffModel.h++:59
TODO: rewrite comment A range of elements in a DiffSequence.
Definition: DiffRange.h++:17
A base class for objects that can emit a signal when their internal state changes in some way...
Definition: MutableObject.h++:17
int sequenceLength(DiffRole role) const
void outputEdScript(DiffRole source, DiffRole destination, QTextStream &stream) const
bool outputMerge(QTextStream &stream, DiffCounts *counts) const
void dump(DiffDirection diffDir) const
Definition: DiffTypes.h++:32
const DiffChunk * chunkForIndex(DiffRole role, int index) const
void setBaseConflictMarker(const QString &marker)
Definition: DiffModel.h++:49
void diff2(const QString &baseText, const QString &yoursText)
Definition: BarChartView.h++:6
TODO: rewrite comment Abstract base class for sequences that can be diffed.
Definition: DiffSequence.h++:20
void setRecursiveDiff(bool recursiveDiff)
Definition: DiffModel.h++:97
void diff3(const QString &theirsText, const QString &baseText, const QString &yoursText)
TODO: rewrite doc A data model representing a 2-way or 3-way diff.
Definition: DiffModel.h++:23
DiffDirection
Definition: DiffTypes.h++:29
DiffRole
Definition: DiffTypes.h++:11
void setTheirsConflictMarker(const QString &marker)
Definition: DiffModel.h++:44
const QVector< DiffChunk * > * diffChunks() const
void setYoursConflictMarker(const QString &marker)
Definition: DiffModel.h++:54
void setAggressiveMerge(bool aggressiveMerge)
Definition: DiffModel.h++:100
TODO: rewrite comment A DiffChunk maps a DiffRange in one DiffSequence (the "base") to a correspondin...
Definition: DiffChunk.h++:46
Definition: DiffResult.h++:13