Method slotJoinDiffs

src/mergeresultwindow.cpp:1328–1371

}

void MergeResultWindow::slotJoinDiffs(qint32 firstD3lLineIdx, qint32 lastD3lLineIdx)
{
    MergeBlockList::iterator i;
    MergeBlockList::iterator iMBLStart = m_mergeBlockList.end();
    MergeBlockList::iterator iMBLEnd = m_mergeBlockList.end();

    mUndoRec.reset();
    for(i = m_mergeBlockList.begin(); i != m_mergeBlockList.end(); ++i)
    {
        const MergeBlock& mb = *i;
        if(firstD3lLineIdx >= mb.getIndex() && firstD3lLineIdx < mb.getIndex() + mb.sourceRangeLength())
        {
            iMBLStart = i;
        }
        if(lastD3lLineIdx >= mb.getIndex() && lastD3lLineIdx < mb.getIndex() + mb.sourceRangeLength())
        {
            iMBLEnd = i;
            ++iMBLEnd;
            break;
        }
    }

    bool bJoined = false;
    for(i = iMBLStart; i != iMBLEnd && i != m_mergeBlockList.end();)
    {
        if(i == iMBLStart)
        {
            ++i;
        }
        else
        {
            iMBLStart->join(*i);
            i = m_mergeBlockList.erase(i);
            bJoined = true;
        }
    }
    if(bJoined)
    {
        iMBLStart->list().clear();
        // Insert a conflict line as placeholder
        iMBLStart->list().push_back(MergeEditLine(iMBLStart->id3l()));
    }
    setFastSelector(iMBLStart);
}

void MergeResultWindow::myUpdate(qint32 afterMilliSecs)
{