Changes in src/World.cpp [112b09:387b36]

File:

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

src/World.cpp ¶

@@ -5 +5 @@
  *      Author: crueger
  */
-
-#include "Helpers/MemDebug.hpp"
 
 #include "World.hpp"
@@ -81 +79 @@
 }
 
-char * World::getDefaultName() {
+std::string World::getDefaultName() {
   return defaultName;
 }
 
-void World::setDefaultName(char * name)
+void World::setDefaultName(std::string name)
 {
-  delete[](defaultName);
-  const int length = strlen(name);
-  if (length < MAXSTRINGSIZE) {
-    defaultName = new char[length+2];
-    strncpy(defaultName, name, length);
-  } else {
-    defaultName = new char[MAXSTRINGSIZE];
-    strncpy(defaultName, "none", MAXSTRINGSIZE-1);
-  }
+  defaultName = name;
 };
 
+int World::getExitFlag() {
+  return ExitFlag;
+}
+
+void World::setExitFlag(int flag) {
+  if (ExitFlag < flag)
+    ExitFlag = flag;
+}
 
 /******************** Methods to change World state *********************/
@@ -127 +125 @@
 
 double *World::cell_size = NULL;
-char *World::defaultName = NULL;
 
 atom *World::createAtom(){
@@ -279 +276 @@
 
 World::World() :
-    Observable("World"),
     periode(new periodentafel),
     configuration(new config),
+    ExitFlag(0),
     atoms(),
     currAtomId(0),
@@ -295 +292 @@
   cell_size[4] = 0.;
   cell_size[5] = 20.;
-  defaultName = new char[MAXSTRINGSIZE];
-  strcpy(defaultName, "none");
+  defaultName = "none";
   molecules_deprecated->signOn(this);
 }
@@ -304 +300 @@
   molecules_deprecated->signOff(this);
   delete[] cell_size;
-  delete[] defaultName;
   delete molecules_deprecated;
   delete periode;