Changes in src/Legacy/oldmenu.cpp [24a5e0:ead4e6]

File:

• src/Legacy/oldmenu.cpp (modified) (12 diffs)

src/Legacy/oldmenu.cpp

@@ -78 +78 @@
       case 'a': // absolute coordinates of atom
         Log() << Verbose(0) << "Enter absolute coordinates." << endl;
-        first = World::get()->createAtom();
+        first = World::getInstance().createAtom();
         first->x.AskPosition(mol->cell_size, false);
         first->type = periode->AskElement();  // give type
@@ -85 +85 @@
 
       case 'b': // relative coordinates of atom wrt to reference point
-        first = World::get()->createAtom();
+        first = World::getInstance().createAtom();
         valid = true;
         do {
@@ -101 +101 @@
 
       case 'c': // relative coordinates of atom wrt to already placed atom
-        first = World::get()->createAtom();
+        first = World::getInstance().createAtom();
         valid = true;
         do {
@@ -117 +117 @@
 
     case 'd': // two atoms, two angles and a distance
-        first = World::get()->createAtom();
+        first = World::getInstance().createAtom();
         valid = true;
         do {
@@ -217 +217 @@
 
       case 'e': // least square distance position to a set of atoms
-        first = World::get()->createAtom();
+        first = World::getInstance().createAtom();
         atoms = new (Vector*[128]);
         valid = true;
@@ -239 +239 @@
           mol->AddAtom(first);  // add to molecule
         } else {
-          World::get()->destroyAtom(first);
+          World::getInstance().destroyAtom(first);
           Log() << Verbose(0) << "Please enter at least two vectors!\n";
         }
@@ -748 +748 @@
   int axis,faktor,count,j;
   atom *first = NULL;
-  element **Elements;
+  const element **Elements;
   Vector x,y;
   Vector **vectors;
@@ -764 +764 @@
     if (mol->AtomCount != 0) {  // if there is more than none
       count = mol->AtomCount;  // is changed becausing of adding, thus has to be stored away beforehand
-      Elements = new element *[count];
+      Elements = new const element *[count];
       vectors = new Vector *[count];
       j = 0;
@@ -782 +782 @@
         x.AddVector(&y); // per factor one cell width further
         for (int k=count;k--;) { // go through every atom of the original cell
-          first = World::get()->createAtom(); // create a new body
+          first = World::getInstance().createAtom(); // create a new body
           first->x.CopyVector(vectors[k]);  // use coordinate of original atom
           first->x.AddVector(&x);     // translate the coordinates
@@ -912 +912 @@
 void oldmenu::SimpleAddMolecules(MoleculeListClass *molecules) {
   molecule *srcmol = NULL, *destmol = NULL;
-  Dialog *dialog = UIFactory::get()->makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
   dialog->queryMolecule("Enter index of destination molecule: ",&destmol, molecules);
   dialog->queryMolecule("Enter index of source molecule to add from: ",&srcmol, molecules);
@@ -926 +926 @@
 void oldmenu::embeddMolecules(MoleculeListClass *molecules) {
   molecule *srcmol = NULL, *destmol = NULL;
-  Dialog *dialog = UIFactory::get()->makeDialog();
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
   dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",&srcmol,molecules);
   dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",&destmol,molecules);
@@ -1089 +1089 @@
     A++;
   }
-  World::get()->destroyMolecule(mol);
+  World::getInstance().destroyMolecule(mol);
 };