2 #ifndef __libquark_diff_DiffChunk_hxx 3 #define __libquark_diff_DiffChunk_hxx 5 #include <QScopedPointer> 61 bool theirsModified,
bool conflict);
68 {
return(!_yoursModified && !_theirsModified); }
73 {
return(_theirsModified && _yoursModified); }
76 {
return(_conflict); }
79 {
return(_baseRange); }
82 {
return(_baseRange); }
86 {
return(_baseRange); }
89 {
return(_baseRange); }
93 {
return(_yoursRange); }
96 {
return(_yoursRange); }
99 {
return(_yoursRange); }
102 {
return(_yoursRange); }
105 {
return(_theirsRange); }
108 {
return(_theirsRange); }
113 { _subDiff.reset(subDiff); }
116 {
return(_subDiff.data()); }
123 QScopedPointer<DiffResult> _subDiff;
125 bool _theirsModified;
134 #endif // __libquark_diff_DiffChunk_hxx void setSubDiff(DiffResult *subDiff)
Definition: DiffChunk.h++:112
TODO: rewrite comment A range of elements in a DiffSequence.
Definition: DiffRange.h++:17
bool isUnchanged() const
Definition: DiffChunk.h++:67
DiffRange & destinationRange()
Definition: DiffChunk.h++:95
const DiffResult * subDiff() const
Definition: DiffChunk.h++:115
Definition: DiffChunk.h++:51
const DiffRange & theirsRange() const
Definition: DiffChunk.h++:104
const DiffRange & range(DiffRole role) const
const DiffRange & sourceRange() const
Definition: DiffChunk.h++:85
Definition: DiffChunk.h++:51
bool isBothModified() const
Definition: DiffChunk.h++:72
bool isModified(DiffRole destination) const
const DiffRange & destinationRange() const
Definition: DiffChunk.h++:92
Type type(DiffRole role, DiffDirection dir) const
Definition: BarChartView.h++:6
Type
Definition: DiffChunk.h++:51
const DiffRange & baseRange() const
Definition: DiffChunk.h++:78
DiffRange & theirsRange()
Definition: DiffChunk.h++:107
DiffRange & yoursRange()
Definition: DiffChunk.h++:101
DiffRange & baseRange()
Definition: DiffChunk.h++:81
Definition: DiffChunk.h++:52
bool isConflict() const
Definition: DiffChunk.h++:75
DiffDirection
Definition: DiffTypes.h++:29
DiffRange & sourceRange()
Definition: DiffChunk.h++:88
DiffRole
Definition: DiffTypes.h++:11
const DiffRange & yoursRange() const
Definition: DiffChunk.h++:98
TODO: rewrite comment A DiffChunk maps a DiffRange in one DiffSequence (the "base") to a correspondin...
Definition: DiffChunk.h++:46
Definition: DiffChunk.h++:51
Definition: DiffResult.h++:13
Definition: DiffChunk.h++:51