| 717 | } |
| 718 | |
| 719 | qint32 MergeResultWindow::getNumberOfUnsolvedConflicts(qint32* pNrOfWhiteSpaceConflicts) const |
| 720 | { |
| 721 | qint32 nrOfUnsolvedConflicts = 0; |
| 722 | if(pNrOfWhiteSpaceConflicts != nullptr) |
| 723 | *pNrOfWhiteSpaceConflicts = 0; |
| 724 | |
| 725 | for(const MergeBlock& mb: m_mergeBlockList) |
| 726 | { |
| 727 | MergeEditLineList::const_iterator melIt = mb.list().cbegin(); |
| 728 | if(melIt->isConflict()) |
| 729 | { |
| 730 | ++nrOfUnsolvedConflicts; |
| 731 | if(mb.isWhiteSpaceConflict() && pNrOfWhiteSpaceConflicts != nullptr) |
| 732 | ++*pNrOfWhiteSpaceConflicts; |
| 733 | } |
| 734 | } |
| 735 | |
| 736 | return nrOfUnsolvedConflicts; |
| 737 | } |
| 738 | |
| 739 | void MergeResultWindow::showNumberOfConflicts(bool showIfNone) |
| 740 | { |
no test coverage detected