Changes in src/moleculelist.cpp [23b547:24a5e0]

File:

• src/moleculelist.cpp (modified) (8 diffs)

src/moleculelist.cpp

@@ -215 +215 @@
   // remove src
   ListOfMolecules.remove(srcmol);
-  World::getInstance().destroyMolecule(srcmol);
+  World::get()->destroyMolecule(srcmol);
   return true;
 };
@@ -750 +750 @@
 void MoleculeListClass::DissectMoleculeIntoConnectedSubgraphs(const periodentafel * const periode, config * const configuration)
 {
-  molecule *mol = World::getInstance().createMolecule();
+  molecule *mol = World::get()->createMolecule();
   atom *Walker = NULL;
   atom *Advancer = NULL;
@@ -775 +775 @@
     }
     // remove the molecule
-    World::getInstance().destroyMolecule(*MolRunner);
+    World::get()->destroyMolecule(*MolRunner);
     ListOfMolecules.erase(MolRunner);
   }
@@ -797 +797 @@
   molecule **molecules = Malloc<molecule *>(MolCount, "config::Load() - **molecules");
   for (int i=0;i<MolCount;i++) {
-    molecules[i] = World::getInstance().createMolecule();
+    molecules[i] = World::get()->createMolecule();
     molecules[i]->ActiveFlag = true;
     strncpy(molecules[i]->name, mol->name, MAXSTRINGSIZE);
@@ -895 +895 @@
   OBSERVE;
   molecule *mol = NULL;
-  mol = World::getInstance().createMolecule();
+  mol = World::get()->createMolecule();
   insert(mol);
 };
@@ -904 +904 @@
   char filename[MAXSTRINGSIZE];
   Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
-  mol = World::getInstance().createMolecule();
+  mol = World::get()->createMolecule();
   do {
     Log() << Verbose(0) << "Enter file name: ";
@@ -962 +962 @@
       mol = *ListRunner;
       ListOfMolecules.erase(ListRunner);
-      World::getInstance().destroyMolecule(mol);
+      World::get()->destroyMolecule(mol);
       break;
     }
@@ -1009 +1009 @@
   // remove the leaf itself
   if (Leaf != NULL) {
-    World::getInstance().destroyMolecule(Leaf);
+    World::get()->destroyMolecule(Leaf);
     Leaf = NULL;
   }