* CutAndPaste.C:

	* text.C: change tracking cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15512 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 9e0b9c17fd6803609f2775919c5a6ffe6cafa96c..9f79f99feec3f476a8a40aecf2d5f4f2d6b3631d 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -319,8 +319,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
        for (pit_type pit = startpit; pit != endpit + 1;) {
                // FIXME: Change tracking (MG)
                bool const merge = !params.trackChanges ||
-                       pars[pit].lookupChange(pars[pit].size()) ==
-                       Change(Change::INSERTED);
+                                  pars[pit].isInserted(pars[pit].size());
                pos_type const left  = ( pit == startpit ? startpos : 0 );
                pos_type const right = ( pit == endpit ? endpos :
                                pars[pit].size() + 1 );

diff --git a/src/text.C b/src/text.C
index 88033fde0ccd0e1be22119e3944843ff2b2e261b..6b3c6f93c05a4ddb648f6f9809f3d478afd8e62f 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1229,10 +1229,8 @@ void LyXText::insertChar(LCursor & cur, char_type c)
                        return;
                }
                BOOST_ASSERT(cur.pos() > 0);
-               if ((par.isLineSeparator(cur.pos() - 1)
-                   || par.isNewline(cur.pos() - 1))
-                   // FIXME: change tracking (MG)
-                   && par.lookupChange(cur.pos() - 1) != Change(Change::DELETED)) {
+               if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
+                   && !par.isDeleted(cur.pos() - 1)) {
                        static bool sent_space_message = false;
                        if (!sent_space_message) {
                                cur.message(_("You cannot type two spaces this way. "
@@ -1461,14 +1459,14 @@ void LyXText::acceptChange(LCursor & cur)
        DocIterator it = cur.selectionBegin();
        DocIterator et = cur.selectionEnd();
        pit_type pit = it.pit();
-       Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
+       bool isDeleted = pars_[pit].isDeleted(it.pos());
        for (; pit <= et.pit(); ++pit) {
                pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
                pos_type right =
                    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
                pars_[pit].acceptChange(left, right);
        }
-       if (type == Change::DELETED) {
+       if (isDeleted) {
                ParagraphList & plist = paragraphs();
                if (it.pit() + 1 < et.pit())
                        pars_.erase(boost::next(plist.begin(), it.pit() + 1),
@@ -1476,8 +1474,7 @@ void LyXText::acceptChange(LCursor & cur)
 
                // Paragraph merge if appropriate:
                // FIXME: change tracking (MG)
-               if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
-                       == Change(Change::DELETED)) {
+               if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) {
                        setCursorIntern(cur, it.pit() + 1, 0);
                        backspacePos0(cur);
                }
@@ -1499,22 +1496,21 @@ void LyXText::rejectChange(LCursor & cur)
        DocIterator it = cur.selectionBegin();
        DocIterator et = cur.selectionEnd();
        pit_type pit = it.pit();
-       Change::Type const type = pars_[pit].lookupChange(it.pos()).type;
+       bool isInserted = pars_[pit].isInserted(it.pos());
        for (; pit <= et.pit(); ++pit) {
                pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
                pos_type right =
                    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
                pars_[pit].rejectChange(left, right);
        }
-       if (type == Change::INSERTED) {
+       if (isInserted) {
                ParagraphList & plist = paragraphs();
                if (it.pit() + 1 < et.pit())
                        pars_.erase(boost::next(plist.begin(), it.pit() + 1),
                                    boost::next(plist.begin(), et.pit()));
                // Paragraph merge if appropriate:
                // FIXME: change tracking (MG)
-               if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
-                       == Change(Change::INSERTED)) {
+               if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) {
                        setCursorIntern(cur, it.pit() + 1, 0);
                        backspacePos0(cur);
                }
@@ -1640,7 +1636,7 @@ bool LyXText::erase(LCursor & cur)
                setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
                needsUpdate = backspace(cur);
                // FIXME: change tracking (MG)
-               if (cur.paragraph().lookupChange(cur.pos()) == Change(Change::DELETED))
+               if (cur.paragraph().isDeleted(cur.pos()))
                        cur.posRight();
        } else if (cur.pit() != cur.lastpit()) {
                LCursor scur = cur;
@@ -1654,7 +1650,7 @@ bool LyXText::erase(LCursor & cur)
                                // move forward after the paragraph break is DELETED
                                Paragraph & par = cur.paragraph();
                                // FIXME: change tracking (MG)
-                               if (par.lookupChange(par.size()) == Change(Change::DELETED))
+                               if (par.isDeleted(par.size()))
                                        setCursorIntern(cur, cur.pit() + 1, 0);
                                }
                } else {
@@ -1762,7 +1758,7 @@ bool LyXText::backspace(LCursor & cur)
                        Paragraph & par = pars_[cur.pit() - 1];
                        // Take care of a just inserted para break:
                        // FIXME: change tracking (MG)
-                       if (par.lookupChange(par.size()) != Change(Change::INSERTED)) {
+                       if (!par.isInserted(par.size())) {
                                // FIXME: change tracking (MG)
                                par.setChange(par.size(), Change(Change::DELETED));
                                setCursorIntern(cur, cur.pit() - 1, par.size());