Changeset b5b01e for src/Actions/SelectionAction/Molecules

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, Candidate_v1.7.0, Candidate_v1.7.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/Molecules

Files:

• AllMoleculesAction.cpp (modified) (2 diffs)
• ClearAllMoleculesAction.cpp (modified) (2 diffs)
• InvertMoleculesAction.cpp (modified) (3 diffs)
• MoleculeByFormulaAction.cpp (modified) (3 diffs)
• MoleculeByIdAction.cpp (modified) (3 diffs)
• MoleculeByNameAction.cpp (modified) (3 diffs)
• MoleculeByOrderAction.cpp (modified) (3 diffs)
• MoleculeOfAtomAction.cpp (modified) (2 diffs)
• NotAllMoleculesAction.cpp (modified) (2 diffs)
• NotMoleculeByFormulaAction.cpp (modified) (3 diffs)
• NotMoleculeByIdAction.cpp (modified) (3 diffs)
• NotMoleculeByNameAction.cpp (modified) (3 diffs)
• NotMoleculeByOrderAction.cpp (modified) (3 diffs)
• NotMoleculeOfAtomAction.cpp (modified) (2 diffs)

src/Actions/SelectionAction/Molecules/AllMoleculesAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionAllMoleculesAction::performCall() {
+ActionState::ptr SelectionAllMoleculesAction::performCall() {
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
   LOG(1, "Selecting all molecules.");
   World::getInstance().selectAllMolecules(AllMolecules());
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-  return Action::state_ptr(new SelectionAllMoleculesState(selectedMolecules,params));
+  return ActionState::ptr(new SelectionAllMoleculesState(selectedMolecules,params));
 }
 
-Action::state_ptr SelectionAllMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionAllMoleculesAction::performUndo(ActionState::ptr _state) {
   SelectionAllMoleculesState *state = assert_cast<SelectionAllMoleculesState*>(_state.get());
 
@@ -69 +69 @@
     World::getInstance().selectMolecule(_mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionAllMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionAllMoleculesAction::performRedo(ActionState::ptr _state){
   //SelectionAllMoleculesState *state = assert_cast<SelectionAllMoleculesState*>(_state.get());
 
   World::getInstance().selectAllMolecules(AllMolecules());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/ClearAllMoleculesAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionClearAllMoleculesAction::performCall() {
+ActionState::ptr SelectionClearAllMoleculesAction::performCall() {
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
   LOG(1, "Clearing molecule selection.");
   World::getInstance().clearMoleculeSelection();
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-  return Action::state_ptr(new SelectionClearAllMoleculesState(selectedMolecules,params));
+  return ActionState::ptr(new SelectionClearAllMoleculesState(selectedMolecules,params));
 }
 
-Action::state_ptr SelectionClearAllMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionClearAllMoleculesAction::performUndo(ActionState::ptr _state) {
   SelectionClearAllMoleculesState *state = assert_cast<SelectionClearAllMoleculesState*>(_state.get());
 
@@ -68 +68 @@
     World::getInstance().selectMolecule(_mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionClearAllMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionClearAllMoleculesAction::performRedo(ActionState::ptr _state){
   //SelectionClearAllMoleculesState *state = assert_cast<SelectionClearAllMoleculesState*>(_state.get());
 
   World::getInstance().clearMoleculeSelection();
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/InvertMoleculesAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionInvertMoleculesAction::performCall() {
+ActionState::ptr SelectionInvertMoleculesAction::performCall() {
   World::getInstance().invertMoleculeSelection();
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
 
-  return Action::state_ptr(new SelectionInvertMoleculesState(params));
+  return ActionState::ptr(new SelectionInvertMoleculesState(params));
 }
 
-Action::state_ptr SelectionInvertMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionInvertMoleculesAction::performUndo(ActionState::ptr _state) {
   //SelectionInvertMoleculesState *state = assert_cast<SelectionInvertMoleculesState*>(_state.get());
 
@@ -67 +67 @@
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionInvertMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionInvertMoleculesAction::performRedo(ActionState::ptr _state){
   //SelectionInvertMoleculesState *state = assert_cast<SelectionInvertMoleculesState*>(_state.get());
 
@@ -76 +76 @@
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionMoleculeByFormulaAction::performCall() {
+ActionState::ptr SelectionMoleculeByFormulaAction::performCall() {
   LOG(1, "Selecting molecules with chemical formula " << params.formula.get() << ":");
 //  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula.get()));
@@ -63 +63 @@
   World::getInstance().selectAllMolecules(MoleculeByFormula(params.formula.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-  return Action::state_ptr(new SelectionMoleculeByFormulaState(selectedMolecules,params));
+  return ActionState::ptr(new SelectionMoleculeByFormulaState(selectedMolecules,params));
 }
 
-Action::state_ptr SelectionMoleculeByFormulaAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionMoleculeByFormulaAction::performUndo(ActionState::ptr _state) {
   SelectionMoleculeByFormulaState *state = assert_cast<SelectionMoleculeByFormulaState*>(_state.get());
 
@@ -73 +73 @@
     World::getInstance().selectMolecule(mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionMoleculeByFormulaAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionMoleculeByFormulaAction::performRedo(ActionState::ptr _state){
   SelectionMoleculeByFormulaState *state = assert_cast<SelectionMoleculeByFormulaState*>(_state.get());
 
   World::getInstance().selectAllMolecules(MoleculeByFormula(state->params.formula.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionMoleculeByIdAction::performCall() {
+ActionState::ptr SelectionMoleculeByIdAction::performCall() {
   const molecule *mol = World::getInstance().getMolecule(MoleculeById(params.molindex.get()));
   if (mol != NULL) {
@@ -59 +59 @@
       World::getInstance().selectAllMolecules(MoleculeById(params.molindex.get()));
       LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-      return Action::state_ptr(new SelectionMoleculeByIdState(params));
+      return ActionState::ptr(new SelectionMoleculeByIdState(params));
     } else {
       return Action::success;
@@ -68 +68 @@
 }
 
-Action::state_ptr SelectionMoleculeByIdAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionMoleculeByIdAction::performUndo(ActionState::ptr _state) {
   SelectionMoleculeByIdState *state = assert_cast<SelectionMoleculeByIdState*>(_state.get());
 
   World::getInstance().unselectAllMolecules(MoleculeById(state->params.molindex.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionMoleculeByIdAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionMoleculeByIdAction::performRedo(ActionState::ptr _state){
   SelectionMoleculeByIdState *state = assert_cast<SelectionMoleculeByIdState*>(_state.get());
 
   World::getInstance().selectAllMolecules(MoleculeById(state->params.molindex.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/MoleculeByNameAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionMoleculeByNameAction::performCall() {
+ActionState::ptr SelectionMoleculeByNameAction::performCall() {
   LOG(1, "Selecting all molecules called " << params.molname.get());
   std::vector<molecule *> selectedMolecules =
@@ -61 +61 @@
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
 
-  return Action::state_ptr(new SelectionMoleculeByNameState(selectedMolecules,params));
+  return ActionState::ptr(new SelectionMoleculeByNameState(selectedMolecules,params));
 }
 
-Action::state_ptr SelectionMoleculeByNameAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionMoleculeByNameAction::performUndo(ActionState::ptr _state) {
   SelectionMoleculeByNameState *state = assert_cast<SelectionMoleculeByNameState*>(_state.get());
 
@@ -71 +71 @@
     World::getInstance().selectMolecule(mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionMoleculeByNameAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionMoleculeByNameAction::performRedo(ActionState::ptr _state){
   SelectionMoleculeByNameState *state = assert_cast<SelectionMoleculeByNameState*>(_state.get());
 
   World::getInstance().selectAllMolecules(MoleculeByName(state->params.molname.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

@@ -53 +53 @@
 /** =========== define the function ====================== */
 
-Action::state_ptr SelectionMoleculeByOrderAction::performCall() {
+ActionState::ptr SelectionMoleculeByOrderAction::performCall() {
   molecule *mol = World::getInstance().getMolecule(MoleculeByOrder(params.molindex.get()));
 
@@ -61 +61 @@
       World::getInstance().selectMolecule(mol);
       LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-      return Action::state_ptr(new SelectionMoleculeByOrderState(mol, params));
+      return ActionState::ptr(new SelectionMoleculeByOrderState(mol, params));
     } else {
       return Action::success;
@@ -70 +70 @@
 }
 
-Action::state_ptr SelectionMoleculeByOrderAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionMoleculeByOrderAction::performUndo(ActionState::ptr _state) {
   SelectionMoleculeByOrderState *state = assert_cast<SelectionMoleculeByOrderState*>(_state.get());
 
   World::getInstance().unselectMolecule(state->mol);
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionMoleculeByOrderAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionMoleculeByOrderAction::performRedo(ActionState::ptr _state){
   SelectionMoleculeByOrderState *state = assert_cast<SelectionMoleculeByOrderState*>(_state.get());
 
   World::getInstance().selectMolecule(state->mol);
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/MoleculeOfAtomAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionMoleculeOfAtomAction::performCall() {
+ActionState::ptr SelectionMoleculeOfAtomAction::performCall() {
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
   LOG(1, "Selecting molecule to currently selected atoms.");
   World::getInstance().selectAllMolecules(MoleculesByAtomSelection());
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-  return Action::state_ptr(new SelectionMoleculeOfAtomState(selectedMolecules, params));
+  return ActionState::ptr(new SelectionMoleculeOfAtomState(selectedMolecules, params));
 }
 
-Action::state_ptr SelectionMoleculeOfAtomAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionMoleculeOfAtomAction::performUndo(ActionState::ptr _state) {
   SelectionMoleculeOfAtomState *state = assert_cast<SelectionMoleculeOfAtomState*>(_state.get());
 
@@ -68 +68 @@
     World::getInstance().selectMolecule(_mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionMoleculeOfAtomAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionMoleculeOfAtomAction::performRedo(ActionState::ptr _state){
   //SelectionMoleculeOfAtomState *state = assert_cast<SelectionMoleculeOfAtomState*>(_state.get());
 
   World::getInstance().selectAllMolecules(MoleculesByAtomSelection());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotAllMoleculesAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotAllMoleculesAction::performCall() {
+ActionState::ptr SelectionNotAllMoleculesAction::performCall() {
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
   LOG(1, "Unselecting all molecules.");
   World::getInstance().clearMoleculeSelection();
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-  return Action::state_ptr(new SelectionNotAllMoleculesState(selectedMolecules,params));
+  return ActionState::ptr(new SelectionNotAllMoleculesState(selectedMolecules,params));
 }
 
-Action::state_ptr SelectionNotAllMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotAllMoleculesAction::performUndo(ActionState::ptr _state) {
   SelectionNotAllMoleculesState *state = assert_cast<SelectionNotAllMoleculesState*>(_state.get());
 
@@ -68 +68 @@
     World::getInstance().selectMolecule(_mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotAllMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotAllMoleculesAction::performRedo(ActionState::ptr _state){
   //SelectionNotAllMoleculesState *state = assert_cast<SelectionNotAllMoleculesState*>(_state.get());
 
   World::getInstance().clearMoleculeSelection();
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotMoleculeByFormulaAction::performCall() {
+ActionState::ptr SelectionNotMoleculeByFormulaAction::performCall() {
   LOG(1, "Unselecting molecules with chemical formula " << params.formula.get() << ":");
   std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula.get()));
@@ -60 +60 @@
   World::getInstance().unselectAllMolecules(MoleculeByFormula(params.formula.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-  return Action::state_ptr(new SelectionNotMoleculeByFormulaState(unselectedMolecules,params));
+  return ActionState::ptr(new SelectionNotMoleculeByFormulaState(unselectedMolecules,params));
 }
 
-Action::state_ptr SelectionNotMoleculeByFormulaAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotMoleculeByFormulaAction::performUndo(ActionState::ptr _state) {
   SelectionNotMoleculeByFormulaState *state = assert_cast<SelectionNotMoleculeByFormulaState*>(_state.get());
 
@@ -70 +70 @@
     World::getInstance().unselectMolecule(mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotMoleculeByFormulaAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotMoleculeByFormulaAction::performRedo(ActionState::ptr _state){
   SelectionNotMoleculeByFormulaState *state = assert_cast<SelectionNotMoleculeByFormulaState*>(_state.get());
 
   World::getInstance().unselectAllMolecules(MoleculeByFormula(state->params.formula.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotMoleculeByIdAction::performCall() {
+ActionState::ptr SelectionNotMoleculeByIdAction::performCall() {
   const molecule *mol = World::getInstance().getMolecule(MoleculeById(params.molindex.get()));
   if (mol != NULL) {
@@ -59 +59 @@
       World::getInstance().unselectAllMolecules(MoleculeById(params.molindex.get()));
       LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-      return Action::state_ptr(new SelectionNotMoleculeByIdState(params));
+      return ActionState::ptr(new SelectionNotMoleculeByIdState(params));
     } else {
       return Action::success;
@@ -68 +68 @@
 }
 
-Action::state_ptr SelectionNotMoleculeByIdAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotMoleculeByIdAction::performUndo(ActionState::ptr _state) {
   SelectionNotMoleculeByIdState *state = assert_cast<SelectionNotMoleculeByIdState*>(_state.get());
 
   World::getInstance().selectAllMolecules(MoleculeById(state->params.molindex.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotMoleculeByIdAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotMoleculeByIdAction::performRedo(ActionState::ptr _state){
   SelectionNotMoleculeByIdState *state = assert_cast<SelectionNotMoleculeByIdState*>(_state.get());
 
   World::getInstance().unselectAllMolecules(MoleculeById(state->params.molindex.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotMoleculeByNameAction::performCall() {
+ActionState::ptr SelectionNotMoleculeByNameAction::performCall() {
   LOG(1, "Unselecting all molecule called " << params.molname.get());
   std::vector<molecule *> unselectedMolecules =
@@ -61 +61 @@
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
 
-  return Action::state_ptr(new SelectionNotMoleculeByNameState(unselectedMolecules,params));
+  return ActionState::ptr(new SelectionNotMoleculeByNameState(unselectedMolecules,params));
 }
 
-Action::state_ptr SelectionNotMoleculeByNameAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotMoleculeByNameAction::performUndo(ActionState::ptr _state) {
   SelectionNotMoleculeByNameState *state = assert_cast<SelectionNotMoleculeByNameState*>(_state.get());
 
@@ -71 +71 @@
     World::getInstance().unselectMolecule(mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotMoleculeByNameAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotMoleculeByNameAction::performRedo(ActionState::ptr _state){
   SelectionNotMoleculeByNameState *state = assert_cast<SelectionNotMoleculeByNameState*>(_state.get());
 
   World::getInstance().unselectAllMolecules(MoleculeByName(state->params.molname.get()));
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp

@@ -53 +53 @@
 /** =========== define the function ====================== */
 
-Action::state_ptr SelectionNotMoleculeByOrderAction::performCall() {
+ActionState::ptr SelectionNotMoleculeByOrderAction::performCall() {
   molecule *mol = World::getInstance().getMolecule(MoleculeByOrder(params.molindex.get()));
 
@@ -61 +61 @@
       World::getInstance().unselectMolecule(mol);
       LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-      return Action::state_ptr(new SelectionNotMoleculeByOrderState(mol, params));
+      return ActionState::ptr(new SelectionNotMoleculeByOrderState(mol, params));
     } else {
       return Action::success;
@@ -70 +70 @@
 }
 
-Action::state_ptr SelectionNotMoleculeByOrderAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotMoleculeByOrderAction::performUndo(ActionState::ptr _state) {
   SelectionNotMoleculeByOrderState *state = assert_cast<SelectionNotMoleculeByOrderState*>(_state.get());
 
   World::getInstance().selectMolecule(state->mol);
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotMoleculeByOrderAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotMoleculeByOrderAction::performRedo(ActionState::ptr _state){
   SelectionNotMoleculeByOrderState *state = assert_cast<SelectionNotMoleculeByOrderState*>(_state.get());
 
   World::getInstance().unselectMolecule(state->mol);
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr SelectionNotMoleculeOfAtomAction::performCall() {
+ActionState::ptr SelectionNotMoleculeOfAtomAction::performCall() {
   std::vector<molecule *> unselectedMolecules = World::getInstance().getSelectedMolecules();
   LOG(1, "Unselecting molecule to currently selected atoms.");
   World::getInstance().unselectAllMolecules(MoleculesByAtomSelection());
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-  return Action::state_ptr(new SelectionNotMoleculeOfAtomState(unselectedMolecules, params));
+  return ActionState::ptr(new SelectionNotMoleculeOfAtomState(unselectedMolecules, params));
 }
 
-Action::state_ptr SelectionNotMoleculeOfAtomAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr SelectionNotMoleculeOfAtomAction::performUndo(ActionState::ptr _state) {
   SelectionNotMoleculeOfAtomState *state = assert_cast<SelectionNotMoleculeOfAtomState*>(_state.get());
 
@@ -68 +68 @@
     World::getInstance().selectMolecule(_mol);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr SelectionNotMoleculeOfAtomAction::performRedo(Action::state_ptr _state){
+ActionState::ptr SelectionNotMoleculeOfAtomAction::performRedo(ActionState::ptr _state){
   //SelectionNotMoleculeOfAtomState *state = assert_cast<SelectionNotMoleculeOfAtomState*>(_state.get());
 
   World::getInstance().unselectAllMolecules(MoleculesByAtomSelection());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }