Commit 58a4151f authored by Michael Reeves's avatar Michael Reeves

Only flag line as modifed if no source is selected.

Don't flag lines removed from one source as modified when selecting that
source.
parent 60e142bd
Pipeline #24353 passed with stage
in 7 minutes and 55 seconds
......@@ -162,14 +162,14 @@ private:
explicit MergeEditLine(const Diff3LineList::const_iterator &i, e_SrcSelector src=None){m_id3l=i; m_src=src; m_bLineRemoved=false; mChanged = false; }
void setConflict() { mChanged = false; m_src=None; m_bLineRemoved=false; m_str=QString(); }
bool isConflict() { return m_src==None && !m_bLineRemoved && !mChanged; }
void setRemoved(e_SrcSelector src=None) { m_src=src; m_bLineRemoved=true; mChanged=true; m_str=QString(); }
void setRemoved(e_SrcSelector src=None) { m_src=src; m_bLineRemoved=true; mChanged=(m_src == None); m_str=QString(); }
bool isRemoved() { return m_bLineRemoved; }
bool isEditableText() { return !isConflict() && !isRemoved(); }
void setString( const QString& s ){ m_str=s; m_bLineRemoved=false; m_src=None; mChanged=true; }
QString getString( const MergeResultWindow* );
bool isModified() { return mChanged; }
void setSource( e_SrcSelector src, bool bLineRemoved ) { m_src=src; m_bLineRemoved = bLineRemoved; if(bLineRemoved) mChanged = true; }
void setSource( e_SrcSelector src, bool bLineRemoved ) { m_src=src; m_bLineRemoved = bLineRemoved; if(bLineRemoved) mChanged = true; if(m_src != None) mChanged = false; }
e_SrcSelector src() { return m_src; }
Diff3LineList::const_iterator id3l(){return m_id3l;}
// getString() is implemented as MergeResultWindow::getString()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment