Changes in src/Actions/ActionHistory.cpp [0b2ce9:e4afb4]

File:

• src/Actions/ActionHistory.cpp (modified) (4 diffs)

src/Actions/ActionHistory.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "ActionHistory.hpp"
+#include "Actions/ActionHistory.hpp"
 
 #include <iostream>
@@ -26 +26 @@
 #include "Patterns/Singleton_impl.hpp"
 #include "Helpers/Assert.hpp"
-#include "Helpers/MemDebug.hpp"
-
-using namespace std;
 
 ActionHistory::ActionHistory()
@@ -72 +69 @@
   ActionHistory *hist = new ActionHistory();
   setInstance(hist);
-  new UndoAction(hist);
-  new RedoAction(hist);
 }
 
@@ -80 +75 @@
 /****************** Contained actions *******************/
 
-const char ActionHistory::UndoAction::NAME[] = "undo";
-
-ActionHistory::UndoAction::UndoAction(ActionHistory *_hist) :
-  Action(NAME),
-  hist(_hist)
-{}
-
-ActionHistory::UndoAction::~UndoAction(){}
-
-bool ActionHistory::UndoAction::canUndo(){
-  return false;
-}
-
-bool ActionHistory::UndoAction::shouldUndo(){
-  return false;
-}
-
-bool ActionHistory::UndoAction::isActive(){
-  return hist->hasUndo();
-}
-
-void ActionHistory::UndoAction::getParametersfromValueStorage()
-{}
-
-Dialog* ActionHistory::UndoAction::fillDialog(Dialog *dialog){
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-  return dialog;
-}
-
-Action::state_ptr ActionHistory::UndoAction::performCall(){
-  std::cout << "Undo" << std::endl;
-  hist->undoLast();
-  return Action::success;
-}
-
-Action::state_ptr ActionHistory::UndoAction::performUndo(Action::state_ptr){
-  ASSERT(0,"Cannot undo an undo (should use redo for this");
-  return Action::success;
-}
-
-Action::state_ptr ActionHistory::UndoAction::performRedo(Action::state_ptr){
-  ASSERT(0,"Cannot redo an undo");
-  return Action::success;
-}
-
-const char ActionHistory::RedoAction::NAME[] = "redo";
-
-ActionHistory::RedoAction::RedoAction(ActionHistory *_hist) :
-    Action(NAME),
-    hist(_hist)
-{}
-
-ActionHistory::RedoAction::~RedoAction(){}
-
-bool ActionHistory::RedoAction::canUndo(){
-  return false;
-}
-
-bool ActionHistory::RedoAction::shouldUndo(){
-  return false;
-}
-
-bool ActionHistory::RedoAction::isActive(){
-  return hist->hasRedo();
-}
-
-void ActionHistory::RedoAction::getParametersfromValueStorage()
-{}
-
-Dialog* ActionHistory::RedoAction::fillDialog(Dialog *dialog){
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-  return dialog;
-}
-
-Action::state_ptr ActionHistory::RedoAction::performCall(){
-  std::cout << "Redo" << std::endl;
-  hist->redoLast();
-  return Action::success;
-}
-
-Action::state_ptr ActionHistory::RedoAction::performUndo(Action::state_ptr){
-  ASSERT(0,"Cannot undo a redo (should use undo for this");
-  return Action::success;
-}
-
-Action::state_ptr ActionHistory::RedoAction::performRedo(Action::state_ptr){
-  ASSERT(0,"Cannot redo a redo");
-  return Action::success;
-}