C++98 compatible iterator erase

[ardour.git] / libs / pbd / undo.cc

diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc
index 42f7d574ea4030f44f486215901dedba64c0af25..a11edbda47d674658016dfc3b445f9c413377b81 100644 (file)
--- a/libs/pbd/undo.cc
+++ b/libs/pbd/undo.cc
@@ -1,4 +1,4 @@
-/* 
+/*
     Copyright (C) 2001 Brett Viren & Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@ UndoTransaction::~UndoTransaction ()
        clear ();
 }
 
-void 
+void
 command_death (UndoTransaction* ut, Command* c)
 {
        if (ut->clearing()) {
@@ -65,7 +65,7 @@ command_death (UndoTransaction* ut, Command* c)
        }
 }
 
-UndoTransaction& 
+UndoTransaction&
 UndoTransaction::operator= (const UndoTransaction& rhs)
 {
        if (this == &rhs) return *this;
@@ -152,12 +152,12 @@ XMLNode &UndoTransaction::get_state()
 
 class UndoRedoSignaller {
 public:
-    UndoRedoSignaller (UndoHistory& uh) 
-           : _history (uh) { 
-           _history.BeginUndoRedo(); 
+    UndoRedoSignaller (UndoHistory& uh)
+           : _history (uh) {
+           _history.BeginUndoRedo();
     }
-    ~UndoRedoSignaller() { 
-           _history.EndUndoRedo(); 
+    ~UndoRedoSignaller() {
+           _history.EndUndoRedo();
     }
 
 private:
@@ -220,6 +220,13 @@ UndoHistory::add (UndoTransaction* const ut)
        }
 
        UndoList.push_back (ut);
+       /* Adding a transacrion makes the redo list meaningless. */
+       _clearing = true;
+       for (std::list<UndoTransaction*>::iterator i = RedoList.begin(); i != RedoList.end(); ++i) {
+                delete *i;
+        }
+       RedoList.clear ();
+       _clearing = false;
 
        /* we are now owners of the transaction and must delete it when finished with it */
 
@@ -275,7 +282,7 @@ UndoHistory::redo (unsigned int n)
 
        {
                UndoRedoSignaller exception_safe_signaller (*this);
-               
+
                while (n--) {
                        if (RedoList.size() == 0) {
                                return;
@@ -326,7 +333,7 @@ UndoHistory::clear ()
        Changed (); /* EMIT SIGNAL */
 }
 
-XMLNode& 
+XMLNode&
 UndoHistory::get_state (int32_t depth)
 {
     XMLNode *node = new XMLNode ("UndoHistory");