most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas...

[ardour.git] / libs / pbd / pbd / command.h

diff --git a/libs/pbd/pbd/command.h b/libs/pbd/pbd/command.h
index cd9bf0e08a577ff07b69b8c2b960022f15ae7d92..3fac531591ec95520842f49c1356ff8f06f8e02f 100644 (file)
--- a/libs/pbd/pbd/command.h
+++ b/libs/pbd/pbd/command.h
@@ -1,5 +1,6 @@
 /* 
-   Copyright (C) 2006 Hans Fugal & Paul Davis
+    Copyright (C) 2006 Paul Davis
+    Author: Hans Fugal
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,23 +16,34 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: /local/undo/libs/pbd3/pbd/undo.h 80 2006-06-22T22:37:01.079855Z fugalh  $
 */
 
 #ifndef __lib_pbd_command_h__
 #define __lib_pbd_command_h__
 
-#include <pbd/stateful.h>
+#include <pbd/statefuldestructible.h>
 
-class Command : public Stateful
+class Command : public PBD::StatefulDestructible
 {
-    public:
-       virtual ~Command() {}
+public:
+       virtual ~Command() { /* NOTE: derived classes must call drop_references() */ }
+
        virtual void operator() () = 0;
-        virtual void undo() = 0;
-        virtual void redo() { (*this)(); }
-        virtual XMLNode &get_state();
-        virtual int set_state(const XMLNode&) { /* noop */ return 0; }
+       
+       void set_name (const std::string& str) { _name = str; }
+       const std::string& name() const { return _name; }
+       
+       virtual void undo() = 0;
+       virtual void redo() { (*this)(); }
+       
+       virtual XMLNode &get_state();
+       virtual int set_state(const XMLNode&) { /* noop */ return 0; }
+
+protected:
+       Command() {}
+       Command(const std::string& name) : _name(name) {}
+
+       std::string _name;
 };
 
 #endif // __lib_pbd_command_h_