Changeset b5b01e for src/Actions/SelectionAction/Atoms

Timestamp:

Sep 19, 2013, 8:23:52 PM (12 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.

Location:

src/Actions/SelectionAction/Atoms

Files:

• AllAtomsAction.cpp (modified) (2 diffs)
• AllAtomsInsideVolumeAction.cpp (modified) (4 diffs)
• AllAtomsOfMoleculeAction.cpp (modified) (2 diffs)
• AtomByElementAction.cpp (modified) (2 diffs)
• AtomByIdAction.cpp (modified) (5 diffs)
• AtomByOrderAction.cpp (modified) (5 diffs)
• ClearAllAtomsAction.cpp (modified) (2 diffs)
• InvertAtomsAction.cpp (modified) (4 diffs)
• NotAllAtomsAction.cpp (modified) (2 diffs)
• NotAllAtomsInsideVolumeAction.cpp (modified) (4 diffs)
• NotAllAtomsOfMoleculeAction.cpp (modified) (2 diffs)
• NotAtomByElementAction.cpp (modified) (2 diffs)
• NotAtomByIdAction.cpp (modified) (5 diffs)
• NotAtomByOrderAction.cpp (modified) (5 diffs)

src/Actions/SelectionAction/Atoms/AllAtomsAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAllAtomsAction::performCall() {
+ActionState::ptr SelectionAllAtomsAction::performCall() {
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
   LOG(1, "Selecting all atoms.");
   World::getInstance().selectAllAtoms(AllAtoms());
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-  return Action::state_ptr(new SelectionAllAtomsState(selectedAtoms,params));
+  return ActionState::ptr(new SelectionAllAtomsState(selectedAtoms,params));
 }
 
-Action::state_ptr SelectionAllAtomsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAllAtomsAction::performUndo(ActionState::ptr _state) {
   SelectionAllAtomsState *state = assert_cast<SelectionAllAtomsState*>(_state.get());
 
@@ -69 +69 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAllAtomsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAllAtomsAction::performRedo(ActionState::ptr _state){
   //SelectionAllAtomsState *state = assert_cast<SelectionAllAtomsState*>(_state.get());
 
   World::getInstance().selectAllAtoms(AllAtoms());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp

@@ -57 +57 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAllAtomsInsideVolumeAction::performCall() {
+ActionState::ptr SelectionAllAtomsInsideVolumeAction::performCall() {
   LOG(1, "Selecting all atoms inside a volume.");
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
@@ -67 +67 @@
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-  return Action::state_ptr(new SelectionAllAtomsInsideVolumeState(selectedAtoms, params));
+  return ActionState::ptr(new SelectionAllAtomsInsideVolumeState(selectedAtoms, params));
 }
 
-Action::state_ptr SelectionAllAtomsInsideVolumeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAllAtomsInsideVolumeAction::performUndo(ActionState::ptr _state) {
   SelectionAllAtomsInsideVolumeState *state = assert_cast<SelectionAllAtomsInsideVolumeState*>(_state.get());
 
@@ -80 +80 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAllAtomsInsideVolumeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAllAtomsInsideVolumeAction::performRedo(ActionState::ptr _state){
   //SelectionAllAtomsInsideVolumeState *state = assert_cast<SelectionAllAtomsInsideVolumeState*>(_state.get());
 
@@ -91 +91 @@
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAllAtomsOfMoleculeAction::performCall() {
+ActionState::ptr SelectionAllAtomsOfMoleculeAction::performCall() {
   LOG(1, "Selecting all atoms of currently selected molecule.");
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomsByMoleculeSelection());
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-  return Action::state_ptr(new SelectionAllAtomsOfMoleculeState(selectedAtoms, params));
+  return ActionState::ptr(new SelectionAllAtomsOfMoleculeState(selectedAtoms, params));
 }
 
-Action::state_ptr SelectionAllAtomsOfMoleculeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAllAtomsOfMoleculeAction::performUndo(ActionState::ptr _state) {
   SelectionAllAtomsOfMoleculeState *state = assert_cast<SelectionAllAtomsOfMoleculeState*>(_state.get());
 
@@ -70 +70 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAllAtomsOfMoleculeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAllAtomsOfMoleculeAction::performRedo(ActionState::ptr _state){
   //SelectionAllAtomsOfMoleculeState *state = assert_cast<SelectionAllAtomsOfMoleculeState*>(_state.get());
 
   World::getInstance().selectAllAtoms(AtomsByMoleculeSelection());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/AtomByElementAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAtomByElementAction::performCall() {
+ActionState::ptr SelectionAtomByElementAction::performCall() {
   LOG(1, "Selecting atoms of type " << *params.elemental.get());
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomByType(params.elemental.get()));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-  return Action::state_ptr(new SelectionAtomByElementState(selectedAtoms,params));
+  return ActionState::ptr(new SelectionAtomByElementState(selectedAtoms,params));
 }
 
-Action::state_ptr SelectionAtomByElementAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAtomByElementAction::performUndo(ActionState::ptr _state) {
   SelectionAtomByElementState *state = assert_cast<SelectionAtomByElementState*>(_state.get());
 
@@ -70 +70 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAtomByElementAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAtomByElementAction::performRedo(ActionState::ptr _state){
   SelectionAtomByElementState *state = assert_cast<SelectionAtomByElementState*>(_state.get());
 
   World::getInstance().selectAllAtoms(AtomByType(state->params.elemental.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAtomByIdAction::performCall()
+ActionState::ptr SelectionAtomByIdAction::performCall()
 {
   enum Sucess {
@@ -88 +88 @@
     case AllAtomsUnselected:
     case AtomsSelected:
-      return Action::state_ptr(new SelectionAtomByIdState(undoatomids, params));
+      return ActionState::ptr(new SelectionAtomByIdState(undoatomids, params));
       break;
     default:
@@ -97 +97 @@
 }
 
-Action::state_ptr SelectionAtomByIdAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAtomByIdAction::performUndo(ActionState::ptr _state) {
   SelectionAtomByIdState *state = assert_cast<SelectionAtomByIdState*>(_state.get());
 
@@ -106 +106 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAtomByIdAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAtomByIdAction::performRedo(ActionState::ptr _state){
   SelectionAtomByIdState *state = assert_cast<SelectionAtomByIdState*>(_state.get());
 
@@ -118 +118 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/AtomByOrderAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAtomByOrderAction::performCall() {
+ActionState::ptr SelectionAtomByOrderAction::performCall() {
   const atom *Walker = World::getInstance().getAtom(AtomByOrder(params.order.get()));
   if (Walker != NULL) {
@@ -60 +60 @@
       World::getInstance().selectAtom(Walker);
       LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-      return Action::state_ptr(new SelectionAtomByOrderState(Walker->getId(), params));
+      return ActionState::ptr(new SelectionAtomByOrderState(Walker->getId(), params));
     } else {
       return Action::success;
@@ -69 +69 @@
 }
 
-Action::state_ptr SelectionAtomByOrderAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAtomByOrderAction::performUndo(ActionState::ptr _state) {
   SelectionAtomByOrderState *state = assert_cast<SelectionAtomByOrderState*>(_state.get());
 
@@ -75 +75 @@
   World::getInstance().unselectAtom(Walker);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAtomByOrderAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAtomByOrderAction::performRedo(ActionState::ptr _state){
   SelectionAtomByOrderState *state = assert_cast<SelectionAtomByOrderState*>(_state.get());
 
@@ -84 +84 @@
   World::getInstance().selectAtom(Walker);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/ClearAllAtomsAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionClearAllAtomsAction::performCall() {
+ActionState::ptr SelectionClearAllAtomsAction::performCall() {
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
   LOG(1, "Clearing atoms selection.");
   World::getInstance().clearAtomSelection();
-  return Action::state_ptr(new SelectionClearAllAtomsState(selectedAtoms, params));
+  return ActionState::ptr(new SelectionClearAllAtomsState(selectedAtoms, params));
 }
 
-Action::state_ptr SelectionClearAllAtomsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionClearAllAtomsAction::performUndo(ActionState::ptr _state) {
   SelectionClearAllAtomsState *state = assert_cast<SelectionClearAllAtomsState*>(_state.get());
 
@@ -67 +67 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionClearAllAtomsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionClearAllAtomsAction::performRedo(ActionState::ptr _state){
   //SelectionClearAllAtomsState *state = assert_cast<SelectionClearAllAtomsState*>(_state.get());
 
   World::getInstance().clearAtomSelection();
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/InvertAtomsAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionInvertAtomsAction::performCall() {
+ActionState::ptr SelectionInvertAtomsAction::performCall() {
   LOG(1, "Inverting atom selection.");
 
@@ -61 +61 @@
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
 
-  return Action::state_ptr(new SelectionInvertAtomsState(params));
+  return ActionState::ptr(new SelectionInvertAtomsState(params));
 }
 
-Action::state_ptr SelectionInvertAtomsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionInvertAtomsAction::performUndo(ActionState::ptr _state) {
   //SelectionInvertAtomsState *state = assert_cast<SelectionInvertAtomsState*>(_state.get());
 
@@ -70 +70 @@
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionInvertAtomsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionInvertAtomsAction::performRedo(ActionState::ptr _state){
   //SelectionInvertAtomsState *state = assert_cast<SelectionInvertAtomsState*>(_state.get());
 
@@ -79 +79 @@
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAllAtomsAction::performCall() {
+ActionState::ptr SelectionNotAllAtomsAction::performCall() {
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
   LOG(1, "Unselecting all atoms.");
   World::getInstance().clearAtomSelection();
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-  return Action::state_ptr(new SelectionNotAllAtomsState(selectedAtoms, params));
+  return ActionState::ptr(new SelectionNotAllAtomsState(selectedAtoms, params));
 }
 
-Action::state_ptr SelectionNotAllAtomsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAllAtomsAction::performUndo(ActionState::ptr _state) {
   SelectionNotAllAtomsState *state = assert_cast<SelectionNotAllAtomsState*>(_state.get());
 
@@ -68 +68 @@
     World::getInstance().selectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAllAtomsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAllAtomsAction::performRedo(ActionState::ptr _state){
   //SelectionNotAllAtomsState *state = assert_cast<SelectionNotAllAtomsState*>(_state.get());
 
   World::getInstance().clearAtomSelection();
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp

@@ -56 +56 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performCall() {
+ActionState::ptr SelectionNotAllAtomsInsideVolumeAction::performCall() {
   LOG(1, "Unselecting all atoms inside a volume.");
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
@@ -66 +66 @@
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-  return Action::state_ptr(new SelectionNotAllAtomsInsideVolumeState(unselectedAtoms, params));
+  return ActionState::ptr(new SelectionNotAllAtomsInsideVolumeState(unselectedAtoms, params));
 }
 
-Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAllAtomsInsideVolumeAction::performUndo(ActionState::ptr _state) {
   SelectionNotAllAtomsInsideVolumeState *state = assert_cast<SelectionNotAllAtomsInsideVolumeState*>(_state.get());
 
@@ -79 +79 @@
     World::getInstance().unselectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAllAtomsInsideVolumeAction::performRedo(ActionState::ptr _state){
   //SelectionNotAllAtomsInsideVolumeState *state = assert_cast<SelectionNotAllAtomsInsideVolumeState*>(_state.get());
 
@@ -90 +90 @@
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAllAtomsOfMoleculeAction::performCall() {
+ActionState::ptr SelectionNotAllAtomsOfMoleculeAction::performCall() {
   LOG(1, "Unselecting all atoms of currently selected molecules.");
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomsByMoleculeSelection());
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-  return Action::state_ptr(new SelectionNotAllAtomsOfMoleculeState(unselectedAtoms, params));
+  return ActionState::ptr(new SelectionNotAllAtomsOfMoleculeState(unselectedAtoms, params));
 }
 
-Action::state_ptr SelectionNotAllAtomsOfMoleculeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAllAtomsOfMoleculeAction::performUndo(ActionState::ptr _state) {
   SelectionNotAllAtomsOfMoleculeState *state = assert_cast<SelectionNotAllAtomsOfMoleculeState*>(_state.get());
 
@@ -70 +70 @@
     World::getInstance().unselectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAllAtomsOfMoleculeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAllAtomsOfMoleculeAction::performRedo(ActionState::ptr _state){
   //SelectionNotAllAtomsOfMoleculeState *state = assert_cast<SelectionNotAllAtomsOfMoleculeState*>(_state.get());
 
   World::getInstance().unselectAllAtoms(AtomsByMoleculeSelection());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAtomByElementAction::performCall() {
+ActionState::ptr SelectionNotAtomByElementAction::performCall() {
   LOG(1, "Unselecting atoms of type " << *params.elemental.get());
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomByType(params.elemental.get()));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-  return Action::state_ptr(new SelectionNotAtomByElementState(unselectedAtoms,params));
+  return ActionState::ptr(new SelectionNotAtomByElementState(unselectedAtoms,params));
 }
 
-Action::state_ptr SelectionNotAtomByElementAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAtomByElementAction::performUndo(ActionState::ptr _state) {
   SelectionNotAtomByElementState *state = assert_cast<SelectionNotAtomByElementState*>(_state.get());
 
@@ -70 +70 @@
     World::getInstance().unselectAtom(_atom);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAtomByElementAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAtomByElementAction::performRedo(ActionState::ptr _state){
   SelectionNotAtomByElementState *state = assert_cast<SelectionNotAtomByElementState*>(_state.get());
 
   World::getInstance().unselectAllAtoms(AtomByType(state->params.elemental.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAtomByIdAction::performCall()
+ActionState::ptr SelectionNotAtomByIdAction::performCall()
 {
   enum Sucess {
@@ -88 +88 @@
     case AllAtomsSelected:
     case AtomsUnselected:
-      return Action::state_ptr(new SelectionNotAtomByIdState(undoatomids, params));
+      return ActionState::ptr(new SelectionNotAtomByIdState(undoatomids, params));
       break;
     default:
@@ -97 +97 @@
 }
 
-Action::state_ptr SelectionNotAtomByIdAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAtomByIdAction::performUndo(ActionState::ptr _state) {
   SelectionNotAtomByIdState *state = assert_cast<SelectionNotAtomByIdState*>(_state.get());
 
@@ -106 +106 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAtomByIdAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAtomByIdAction::performRedo(ActionState::ptr _state){
   SelectionNotAtomByIdState *state = assert_cast<SelectionNotAtomByIdState*>(_state.get());
 
@@ -118 +118 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Atoms/NotAtomByOrderAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAtomByOrderAction::performCall() {
+ActionState::ptr SelectionNotAtomByOrderAction::performCall() {
   const atom * Walker = World::getInstance().getAtom(AtomByOrder(params.order.get()));
   if (Walker != NULL) {
@@ -60 +60 @@
       World::getInstance().unselectAtom(Walker);
       LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
-      return Action::state_ptr(new SelectionNotAtomByOrderState(Walker->getId(), params));
+      return ActionState::ptr(new SelectionNotAtomByOrderState(Walker->getId(), params));
     } else {
       return Action::success;
@@ -69 +69 @@
 }
 
-Action::state_ptr SelectionNotAtomByOrderAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAtomByOrderAction::performUndo(ActionState::ptr _state) {
   SelectionNotAtomByOrderState *state = assert_cast<SelectionNotAtomByOrderState*>(_state.get());
 
@@ -75 +75 @@
   World::getInstance().selectAtom(Walker);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAtomByOrderAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAtomByOrderAction::performRedo(ActionState::ptr _state){
   SelectionNotAtomByOrderState *state = assert_cast<SelectionNotAtomByOrderState*>(_state.get());
 
@@ -84 +84 @@
   World::getInstance().unselectAtom(Walker);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }