Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/ActionSequenceTest.cpp

    r5b0b98 rf59d81  
    3535  virtual ~canUndoActionStub(){}
    3636
    37   virtual Action::state_ptr performCall(){
    38     return Action::success;
    39   }
    40   virtual Action::state_ptr performUndo(Action::state_ptr){
    41     return Action::success;
    42   }
    43   virtual Action::state_ptr performRedo(Action::state_ptr){
    44     return Action::success;
    45   }
     37  virtual void call(){}
     38  virtual void undo(){}
    4639  virtual bool canUndo(){
    47     return true;
    48   }
    49   virtual bool shouldUndo(){
    5040    return true;
    5141  }
    … …  
    5848  virtual ~cannotUndoActionStub(){}
    5949
    60   virtual Action::state_ptr performCall(){
    61     return Action::success;
    62   }
    63   virtual Action::state_ptr performUndo(Action::state_ptr){
    64     return Action::success;
    65   }
    66   virtual Action::state_ptr performRedo(Action::state_ptr){
    67     return Action::success;
    68   }
     50  virtual void call(){}
     51  virtual void undo(){}
    6952  virtual bool canUndo(){
    7053    return false;
    71   }
    72   virtual bool shouldUndo(){
    73    return true;
    7454  }
    7555};
    … …  
    8464  virtual ~wasCalledActionStub(){}
    8565
    86   virtual Action::state_ptr performCall(){
     66  virtual void call(){
    8767    called = true;
    88     return Action::success;
    89   }
    90   virtual Action::state_ptr performUndo(Action::state_ptr){
     68  }
     69  virtual void undo(){
    9170    called = false;
    92     return Action::success;
    93   }
    94   virtual Action::state_ptr performRedo(Action::state_ptr){
    95     called = true;
    96     return Action::success;
    9771  }
    9872  virtual bool canUndo(){
    99     return true;
    100   }
    101   virtual bool shouldUndo(){
    10273    return true;
    10374  }
    … …  
    214185  sequence->addAction(shouldCall2);
    215186
    216   ActionSequence::stateSet states = sequence->callAll();
    217 
    218   sequence->removeLastAction();
    219   sequence->removeLastAction();
    220 
    221   sequence->undoAll(states);
     187  sequence->callAll();
     188
     189  sequence->removeLastAction();
     190  sequence->removeLastAction();
     191
     192  sequence->undoAll();
    222193
    223194  CPPUNIT_ASSERT_EQUAL(true,shouldCall1->wasCalled());
Note: See TracChangeset for help on using the changeset viewer.