Changes in src/Actions/MakroAction.cpp [24a5e0:5b0b98]

File:

• src/Actions/MakroAction.cpp (modified) (3 diffs)

src/Actions/MakroAction.cpp

@@ -11 +11 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionSequence.hpp"
+#include "Helpers/Assert.hpp"
 
 using namespace std;
+
+class MakroActionState : public ActionState{
+public:
+  MakroActionState(ActionSequence::stateSet _states) :
+    states(_states)
+  {}
+  virtual ~MakroActionState(){
+    // All contained states are destroyed by the shared ptrs
+  }
+
+  ActionSequence::stateSet states;
+};
 
 MakroAction::MakroAction(string _name,ActionSequence* _actions,bool _doRegister) :
@@ -30 +43 @@
 
 
-void MakroAction::call(){
-  actions->callAll();
+Action::state_ptr MakroAction::performCall(){
+  ActionSequence::stateSet states = actions->callAll();
+  return Action::state_ptr(new MakroActionState(states));
 }
 
-void MakroAction::undo() {
-  actions->undoAll();
+Action::state_ptr MakroAction::performUndo(Action::state_ptr _state) {
+  MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
+  ASSERT(state,"Type mismatch for the state of the MakroAction");
+  ActionSequence::stateSet states = actions->undoAll(state->states);
+  return Action::state_ptr(new MakroActionState(states));
+}
+
+Action::state_ptr MakroAction::performRedo(Action::state_ptr _state){
+  MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
+  ASSERT(state,"Type mismatch for the state of the MakroAction");
+  ActionSequence::stateSet states = actions->redoAll(state->states);
+  return Action::state_ptr(new MakroActionState(states));
 }
 
@@ -41 +65 @@
   return actions->canUndo();
 }
+
+bool MakroAction::shouldUndo() {
+  return actions->shouldUndo();
+}