Changes in src/Actions/ActionSequence.cpp [4e145c:047878]

File:

• src/Actions/ActionSequence.cpp (modified) (1 diff)

src/Actions/ActionSequence.cpp

@@ -41 +41 @@
 // this method is used outside the ActionModule
 // Each action registers itself with the history
-void ActionSequence::callAllDialogs(){
+Dialog* ActionSequence::fillAllDialogs(Dialog *dialog){
   for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
-    // we want to have a global bookkeeping for all actions in the sequence, so
-    // we bypass the normal call
-    Dialog * dialog = (*it)->createDialog();
-    if (dialog != NULL) {
-      dialog->display();
-      delete(dialog);
-    }
+    dialog = (*it)->fillDialog(dialog);
   }
-}
-
-// This method is used internally when MakroActions are constructed.
-// In this case only the makro Action should be registered and
-// handle the states
-ActionSequence::stateSet ActionSequence::callAllDialogs(bool){
-  stateSet states;
-  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
-    // we want to have a global bookkeeping for all actions in the sequence, so
-    // we bypass the normal call
-    (*it)->createDialog()->display();
-  }
-  return states;
+  return dialog;
 }