resolve merge with master (?)

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

diff --git a/libs/pbd/pbd/command.h b/libs/pbd/pbd/command.h
index 240118901c8f763562e065a821e7636b7276b1fb..db4d2bbd814774d0910b1f59786c25a6d21f43c2 100644 (file)
--- a/libs/pbd/pbd/command.h
+++ b/libs/pbd/pbd/command.h
@@ -1,3 +1,4 @@
+
 /* 
     Copyright (C) 2006 Paul Davis
     Author: Hans Fugal
@@ -21,10 +22,12 @@
 #ifndef __lib_pbd_command_h__
 #define __lib_pbd_command_h__
 
+#include <string>
+
+#include "pbd/signals.h"
 #include "pbd/statefuldestructible.h"
-#include <boost/utility.hpp>
 
-class Command : public PBD::StatefulDestructible, public boost::noncopyable
+class Command : public PBD::StatefulDestructible, public PBD::ScopedConnectionList
 {
 public:
        virtual ~Command() { /* NOTE: derived classes must call drop_references() */ }
@@ -33,12 +36,16 @@ public:
        
        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; }
+       virtual int set_state(const XMLNode&, int /*version*/) { /* noop */ return 0; }
+
+       virtual bool empty () const {
+               return false;
+       }
 
 protected:
        Command() {}