| 606 | } |
| 607 | |
| 608 | qint32 ManualDiffHelpEntry::calcManualDiffFirstDiff3LineIdx(const Diff3LineVector& d3lv) |
| 609 | { |
| 610 | size_t i; |
| 611 | for(i = 0; i < d3lv.size(); ++i) |
| 612 | { |
| 613 | const Diff3Line* d3l = d3lv[i]; |
| 614 | if((lineA1.isValid() && lineA1 == d3l->getLineA()) || |
| 615 | (lineB1.isValid() && lineB1 == d3l->getLineB()) || |
| 616 | (lineC1.isValid() && lineC1 == d3l->getLineC())) |
| 617 | return SafeInt<qint32>(i); |
| 618 | } |
| 619 | return -1; |
| 620 | } |
| 621 | |
| 622 | void DiffList::runDiff(const std::shared_ptr<LineDataVector>& p1, const size_t index1, LineRef size1, const std::shared_ptr<LineDataVector>& p2, const size_t index2, LineRef size2) |
| 623 | { |