Changes in src/config.cpp [cbc5fb:ead4e6]

File:

• src/config.cpp (modified) (9 diffs)

src/config.cpp

@@ -675 +675 @@
 {
   int MaxTypes = 0;
-  element *elementhash[MAX_ELEMENTS];
+  const element *elementhash[MAX_ELEMENTS];
   char name[MAX_ELEMENTS];
   char keyword[MAX_ELEMENTS];
@@ -733 +733 @@
             sprintf(keyword,"%s_%i",name, j+1);
             if (repetition == 0) {
-              neues = World::get()->createAtom();
+              neues = World::getInstance().createAtom();
               AtomList[i][j] = neues;
               LinearList[ FileBuffer->LineMapping[FileBuffer->CurrentLine] ] = neues;
@@ -812 +812 @@
           sprintf(keyword,"%s_%i",name, j+1);
           if (repetition == 0) {
-            neues = World::get()->createAtom();
+            neues = World::getInstance().createAtom();
             AtomList[i][j] = neues;
             LinearList[ FileBuffer->LineMapping[FileBuffer->CurrentLine] ] = neues;
@@ -851 +851 @@
 void config::Load(const char * const filename, const string &BondGraphFileName, const periodentafel * const periode, MoleculeListClass * const &MolList)
 {
-  molecule *mol = World::get()->createMolecule();
+  molecule *mol = World::getInstance().createMolecule();
   ifstream *file = new ifstream(filename);
   if (file == NULL) {
@@ -1089 +1089 @@
 void config::LoadOld(const char * const filename, const string &BondGraphFileName, const periodentafel * const periode, MoleculeListClass * const &MolList)
 {
-  molecule *mol = World::get()->createMolecule();
+  molecule *mol = World::getInstance().createMolecule();
   ifstream *file = new ifstream(filename);
   if (file == NULL) {
@@ -1107 +1107 @@
   string zeile;
   string dummy;
-  element *elementhash[128];
+  const element *elementhash[128];
   int Z = -1;
   int No = -1;
@@ -1288 +1288 @@
         }
         istringstream input2(zeile);
-        atom *neues = World::get()->createAtom();
+        atom *neues = World::getInstance().createAtom();
         input2 >> neues->x.x[0]; // x
         input2 >> neues->x.x[1]; // y
@@ -1788 +1788 @@
   char filename[MAXSTRINGSIZE];
   ofstream output;
-  molecule *mol = World::get()->createMolecule();
+  molecule *mol = World::getInstance().createMolecule();
   mol->SetNameFromFilename(ConfigFileName);
 
@@ -1899 +1899 @@
   }
 
-  World::get()->destroyMolecule(mol);
+  World::getInstance().destroyMolecule(mol);
 };