Method updateDefaults

src/MergeEditLine.cpp:249–298

Changes default merge settings currently used when not in auto mode or if white space is being auto solved. */

    Changes default merge settings currently used when not in auto mode or if white space is being auto solved.
*/
void MergeBlockList::updateDefaults(const e_SrcSelector defaultSelector, const bool bConflictsOnly, const bool bWhiteSpaceOnly)
{
    // Change all auto selections
    MergeBlockList::iterator mbIt;
    for(mbIt = begin(); mbIt != end(); ++mbIt)
    {
        MergeBlock &mb = *mbIt;
        bool bConflict = mb.list().empty() || mb.list().begin()->isConflict();
        if(mb.isDelta() && !(mb.hasModfiedText() && (bConflictsOnly || bWhiteSpaceOnly)) && (!bConflictsOnly || bConflict) && (!bWhiteSpaceOnly || mb.isWhiteSpaceConflict()))
        {
            mb.list().clear();
            if(defaultSelector == e_SrcSelector::Invalid)
            {
                MergeEditLine mel(mb.id3l());

                mel.setConflict();
                mb.bConflict = true;
                mb.list().push_back(mel);
            }
            else
            {
                Diff3LineList::const_iterator d3llit = mb.id3l();
                qint32 j;

                for(j = 0; j < mb.srcRangeLength; ++j)
                {
                    MergeEditLine mel(d3llit);
                    mel.setSource(defaultSelector, false);

                    LineRef srcLine = defaultSelector == e_SrcSelector::A ? d3llit->getLineA() : defaultSelector == e_SrcSelector::B ? d3llit->getLineB() :
                                                                                             defaultSelector == e_SrcSelector::C     ? d3llit->getLineC() :
                                                                                                                                       LineRef();
                    if(srcLine.isValid())
                    {
                        mb.list().push_back(mel);
                    }

                    ++d3llit;
                }

                if(mb.list().empty()) // Make a line nevertheless
                {
                    MergeEditLine mel(mb.id3l());
                    mel.setRemoved(defaultSelector);
                    mb.list().push_back(mel);
                }
            }
        }
    }
}

void MergeBlock::dectectWhiteSpaceConflict(const Diff3Line &d, const bool isThreeWay)
{