Ignore:
Timestamp:
Sep 19, 2013, 8:23:52 PM (11 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
6367dd
Parents:
f92ef3
git-author:
Frederik Heber <heber@…> (08/19/13 19:04:10)
git-committer:
Frederik Heber <heber@…> (09/19/13 20:23:52)
Message:

ActionState extracted into own header file, rename Action::state_ptr -> ActionState::ptr.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/unittests/ActionSequenceUnitTest.cpp

    rf92ef3 rb5b01e  
    7171  }
    7272
    73   virtual Action::state_ptr performCall(){
    74     return Action::success;
    75   }
    76   virtual Action::state_ptr performUndo(Action::state_ptr){
    77     return Action::success;
    78   }
    79   virtual Action::state_ptr performRedo(Action::state_ptr){
     73  virtual ActionState::ptr performCall(){
     74    return Action::success;
     75  }
     76  virtual ActionState::ptr performUndo(ActionState::ptr){
     77    return Action::success;
     78  }
     79  virtual ActionState::ptr performRedo(ActionState::ptr){
    8080    return Action::success;
    8181  }
     
    100100  }
    101101
    102   virtual Action::state_ptr performCall(){
    103     return Action::success;
    104   }
    105   virtual Action::state_ptr performUndo(Action::state_ptr){
    106     return Action::success;
    107   }
    108   virtual Action::state_ptr performRedo(Action::state_ptr){
     102  virtual ActionState::ptr performCall(){
     103    return Action::success;
     104  }
     105  virtual ActionState::ptr performUndo(ActionState::ptr){
     106    return Action::success;
     107  }
     108  virtual ActionState::ptr performRedo(ActionState::ptr){
    109109    return Action::success;
    110110  }
     
    129129    return dialog;
    130130  }
    131   virtual Action::state_ptr performCall(){
     131  virtual ActionState::ptr performCall(){
    132132    called = true;
    133133    return Action::success;
    134134  }
    135   virtual Action::state_ptr performUndo(Action::state_ptr){
     135  virtual ActionState::ptr performUndo(ActionState::ptr){
    136136    called = false;
    137137    return Action::success;
    138138  }
    139   virtual Action::state_ptr performRedo(Action::state_ptr){
     139  virtual ActionState::ptr performRedo(ActionState::ptr){
    140140    called = true;
    141141    return Action::success;
Note: See TracChangeset for help on using the changeset viewer.