X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fundo.h;h=11ff2bf321b806106001ce8a9f27d768b890c86a;hb=a459f96e38f569503e6d983808210d9d43a396ec;hp=0e48bea96238c7b414572d50815e818121c08aad;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 0e48bea962..11ff2bf321 100644
--- a/libs/pbd/pbd/undo.h
+++ b/libs/pbd/pbd/undo.h
@@ -26,8 +26,8 @@
 #include <sigc++/slot.h>
 #include <sigc++/bind.h>
 #include <sys/time.h>
+
 #include "pbd/command.h"
-#include "pbd/shiva.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -37,6 +37,7 @@ class UndoTransaction : public Command
 	UndoTransaction ();
 	UndoTransaction (const UndoTransaction&);
 	UndoTransaction& operator= (const UndoTransaction&);
+	~UndoTransaction ();
 
 	void clear ();
 	bool empty() const;
@@ -61,20 +62,15 @@ class UndoTransaction : public Command
 
   private:
 	std::list<Command*>    actions;
-	std::list<PBD::ProxyShiva<Command,UndoTransaction>*> shivas;
 	struct timeval        _timestamp;
 	bool                  _clearing;
 
 	friend void command_death (UndoTransaction*, Command *);
 	
-	friend class UndoHistory;
-
-	~UndoTransaction ();
 	void about_to_explicitly_delete ();
-	
 };
 
-class UndoHistory : public sigc::trackable
+class UndoHistory : public PBD::ScopedConnectionList
 {
   public:
 	UndoHistory();
@@ -107,7 +103,9 @@ class UndoHistory : public sigc::trackable
 
 	void set_depth (uint32_t);
 
-	sigc::signal<void> Changed;
+	PBD::Signal0<void> Changed;
+	PBD::Signal0<void> BeginUndoRedo;
+	PBD::Signal0<void> EndUndoRedo;
 	
   private:
 	bool _clearing;