Changes in src/World.hpp [5f1d5b8:e4afb4]

File:

• src/World.hpp (modified) (3 diffs)

src/World.hpp

@@ -19 +19 @@
 
 #include "types.hpp"
+#include "Actions/ActionTraits.hpp"
 #include "Descriptors/SelectiveIterator.hpp"
 #include "Patterns/Observer.hpp"
@@ -111 +112 @@
    * menus, be kept around for later use etc.
    */
-  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,std::string,AtomDescriptor);
-  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,std::string);
+  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,const ActionTraits &_trait,AtomDescriptor);
+  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,const ActionTraits &_trait);
 
   /**
@@ -269 +270 @@
   /******** Selections of molecules and Atoms *************/
   void clearAtomSelection();
-  void selectAtom(atom*);
-  void selectAtom(atomId_t);
+  void selectAtom(const atom*);
+  void selectAtom(const atomId_t);
   void selectAllAtoms(AtomDescriptor);
-  void selectAtomsOfMolecule(molecule*);
-  void selectAtomsOfMolecule(moleculeId_t);
-  void unselectAtom(atom*);
-  void unselectAtom(atomId_t);
+  void selectAtomsOfMolecule(const molecule*);
+  void selectAtomsOfMolecule(const moleculeId_t);
+  void unselectAtom(const atom*);
+  void unselectAtom(const atomId_t);
   void unselectAllAtoms(AtomDescriptor);
-  void unselectAtomsOfMolecule(molecule*);
-  void unselectAtomsOfMolecule(moleculeId_t);
+  void unselectAtomsOfMolecule(const molecule*);
+  void unselectAtomsOfMolecule(const moleculeId_t);
   size_t countSelectedAtoms() const;
-  bool isSelected(atom *_atom) const;
+  bool isSelected(const atom *_atom) const;
   const std::vector<atom *> getSelectedAtoms() const;
 
   void clearMoleculeSelection();
-  void selectMolecule(molecule*);
-  void selectMolecule(moleculeId_t);
+  void selectMolecule(const molecule*);
+  void selectMolecule(const moleculeId_t);
   void selectAllMolecules(MoleculeDescriptor);
-  void selectMoleculeOfAtom(atom*);
-  void selectMoleculeOfAtom(atomId_t);
-  void unselectMolecule(molecule*);
-  void unselectMolecule(moleculeId_t);
+  void selectMoleculeOfAtom(const atom*);
+  void selectMoleculeOfAtom(const atomId_t);
+  void unselectMolecule(const molecule*);
+  void unselectMolecule(const moleculeId_t);
   void unselectAllMolecules(MoleculeDescriptor);
-  void unselectMoleculeOfAtom(atom*);
-  void unselectMoleculeOfAtom(atomId_t);
+  void unselectMoleculeOfAtom(const atom*);
+  void unselectMoleculeOfAtom(const atomId_t);
   size_t countSelectedMolecules() const;
-  bool isSelected(molecule *_mol) const;
+  bool isSelected(const molecule *_mol) const;
   const std::vector<molecule *> getSelectedMolecules() const;