Changeset 2019 for code/branches/objecthierarchy/src/util

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

Location:

code/branches/objecthierarchy/src/util

Files:

• Math.cc (modified) (1 diff)
• Math.h (modified) (1 diff)
• OutputHandler.cc (modified) (2 diffs)
• String.cc (modified) (1 diff)
• String.h (modified) (1 diff)

code/branches/objecthierarchy/src/util/Math.cc

@@ -200 +200 @@
     static unsigned long aNumber = 135;
     return aNumber++;
-}
-
-std::string getUniqueNumberStr()
-{
-    return convertToString(getUniqueNumber());
 }
 

code/branches/objecthierarchy/src/util/Math.h

@@ -275 +275 @@
 
 _UtilExport unsigned long getUniqueNumber();
-_UtilExport std::string getUniqueNumberStr();
 
 class _UtilExport IntVector2

code/branches/objecthierarchy/src/util/OutputHandler.cc

@@ -33 +33 @@
 
 #include "OutputHandler.h"
+#include <time.h>
 
 namespace orxonox
@@ -46 +47 @@
         this->logfilename_ = logfilename;
         this->logfile_.open(this->logfilename_.c_str(), std::fstream::out);
-        this->logfile_ << "Started log at yyyy/mm/dd hh:mm:ss" << std::endl; // Todo: Get date and time
+
+        time_t rawtime;
+        struct tm* timeinfo;
+        time(&rawtime);
+        timeinfo = localtime(&rawtime);
+
+        this->logfile_ << "Started log at " << asctime(timeinfo) << std::endl;
         this->logfile_.flush();
     }

code/branches/objecthierarchy/src/util/String.cc

@@ -37 +37 @@
 #include <iostream>
 
-/**
-    @brief Blank string as variable so you can use const std::string& even if you have to return "".
-*/
-std::string blankString = "";
+#include "Convert.h"
+#include "Math.h"
+
+std::string getUniqueNumberString()
+{
+    return convertToString(getUniqueNumber());
+}
 
 /**

code/branches/objecthierarchy/src/util/String.h

@@ -40 +40 @@
 #include <sstream>
 
-extern _UtilExport std::string blankString;
+_UtilExport static const std::string BLANKSTRING = "";
+_UtilExport std::string getUniqueNumberString();
 
 _UtilExport void        strip(std::string* str);