Changes in src/World.hpp [24a5e0:d2dbac0]

File:

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

src/World.hpp

@@ -16 +16 @@
 #include <boost/shared_ptr.hpp>
 
-#include "defs.hpp"
+
 #include "Patterns/Observer.hpp"
 #include "Patterns/Cacheable.hpp"
@@ -40 +40 @@
 friend class ManipulateAtomsProcess;
 template<typename> friend class AtomsCalculation;
+
+typedef std::map<int,atom*> AtomSet;
+typedef std::map<int,molecule*> MoleculeSet;
 public:
-  typedef std::map<atomId_t,atom*> AtomSet;
-  typedef std::map<moleculeId_t,molecule*> MoleculeSet;
 
   /***** getter and setter *****/
@@ -89 +90 @@
   molecule *createMolecule();
 
-  void destroyMolecule(molecule*);
-  void destroyMolecule(moleculeId_t);
-
   /**
    * Create a new atom. This method should be used whenever any atom is needed. Assigns a unique ID and stores
@@ -114 +112 @@
    * atom directly since this will leave the pointer inside the world.
    */
-  void destroyAtom(atomId_t);
+  void destroyAtom(int);
 
   /**
@@ -142 +140 @@
   protected:
     void advanceState();
+    World* world;
     AtomSet::iterator state;
     boost::shared_ptr<AtomDescriptor_impl>  descr;
     int index;
-
-    World* world;
   };
 
@@ -169 +166 @@
   periodentafel *periode;
   AtomSet atoms;
-  atomId_t currAtomId; //!< stores the next available Id for atoms
+  int currAtomId; //!< stores the next available Id for atoms
   MoleculeSet molecules;
-  moleculeId_t currMoleculeId;
+  int currMoleculeId;