diff options
Diffstat (limited to 'src/Document.cxx')
| -rw-r--r-- | src/Document.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index 63b90d69f..4548064b5 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -273,10 +273,10 @@ void Document::TentativeUndo() { for (int step = 0; step < steps; step++) { const Sci::Line prevLinesTotal = LinesTotal(); const Action &action = cb.GetUndoStep(); - if (action.at == removeAction) { + if (action.at == ActionType::remove) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_UNDO, action)); - } else if (action.at == containerAction) { + } else if (action.at == ActionType::container) { DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); dm.token = action.position; NotifyModified(dm); @@ -285,15 +285,15 @@ void Document::TentativeUndo() { SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); - if (action.at != containerAction) { + if (action.at != ActionType::container) { ModifiedAt(action.position); } int modFlags = SC_PERFORMED_UNDO; // With undo, an insertion action becomes a deletion notification - if (action.at == removeAction) { + if (action.at == ActionType::remove) { modFlags |= SC_MOD_INSERTTEXT; - } else if (action.at == insertAction) { + } else if (action.at == ActionType::insert) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) @@ -1326,10 +1326,10 @@ Sci::Position Document::Undo() { for (int step = 0; step < steps; step++) { const Sci::Line prevLinesTotal = LinesTotal(); const Action &action = cb.GetUndoStep(); - if (action.at == removeAction) { + if (action.at == ActionType::remove) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_UNDO, action)); - } else if (action.at == containerAction) { + } else if (action.at == ActionType::container) { DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); dm.token = action.position; NotifyModified(dm); @@ -1344,14 +1344,14 @@ Sci::Position Document::Undo() { SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); - if (action.at != containerAction) { + if (action.at != ActionType::container) { ModifiedAt(action.position); newPos = action.position; } int modFlags = SC_PERFORMED_UNDO; // With undo, an insertion action becomes a deletion notification - if (action.at == removeAction) { + if (action.at == ActionType::remove) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; if ((coalescedRemoveLen > 0) && @@ -1364,7 +1364,7 @@ Sci::Position Document::Undo() { } prevRemoveActionPos = action.position; prevRemoveActionLen = action.lenData; - } else if (action.at == insertAction) { + } else if (action.at == ActionType::insert) { modFlags |= SC_MOD_DELETETEXT; coalescedRemovePos = -1; coalescedRemoveLen = 0; @@ -1406,10 +1406,10 @@ Sci::Position Document::Redo() { for (int step = 0; step < steps; step++) { const Sci::Line prevLinesTotal = LinesTotal(); const Action &action = cb.GetRedoStep(); - if (action.at == insertAction) { + if (action.at == ActionType::insert) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_REDO, action)); - } else if (action.at == containerAction) { + } else if (action.at == ActionType::container) { DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_REDO); dm.token = action.position; NotifyModified(dm); @@ -1418,16 +1418,16 @@ Sci::Position Document::Redo() { SC_MOD_BEFOREDELETE | SC_PERFORMED_REDO, action)); } cb.PerformRedoStep(); - if (action.at != containerAction) { + if (action.at != ActionType::container) { ModifiedAt(action.position); newPos = action.position; } int modFlags = SC_PERFORMED_REDO; - if (action.at == insertAction) { + if (action.at == ActionType::insert) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; - } else if (action.at == removeAction) { + } else if (action.at == ActionType::remove) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) |