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

File:

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

src/World.cpp

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