Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src-QT4/diff.h @ 113:7bca1f1340f6 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents fcd146072e0c
children
comparison
equal deleted inserted replaced
112:0180c7f92563 113:7bca1f1340f6
113 if (pFineBC!=0) delete pFineBC; 113 if (pFineBC!=0) delete pFineBC;
114 if (pFineCA!=0) delete pFineCA; 114 if (pFineCA!=0) delete pFineCA;
115 pFineAB=0; pFineBC=0; pFineCA=0; 115 pFineAB=0; pFineBC=0; pFineCA=0;
116 } 116 }
117 117
118 bool operator==( const Diff3Line& d3l ) 118 bool operator==( const Diff3Line& d3l ) const
119 { 119 {
120 return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC 120 return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
121 && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC; 121 && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
122 } 122 }
123 123