Changeset 6698 for code/branches/chat/src/orxonox/ChatHistory.h

Timestamp:

Apr 12, 2010, 5:08:27 PM (14 years ago)

Author:

smerkli

Message:

ChatHistory is not being constructed, no idea why.

File:

• code/branches/chat/src/orxonox/ChatHistory.h (modified) (6 diffs)

code/branches/chat/src/orxonox/ChatHistory.h

@@ -31 +31 @@
 #include <fstream>
 #include <iostream>
+#include <cassert>
 
 /* define this if you're unit testing */
-#define TEST 1
+#define CHATTEST 0
 
-#ifndef TEST
+#ifndef CHATTEST
 #include <core/BaseObject.h>
 #include <core/PathConfig.h>
+#include <Singleton.h>
 #endif
 
@@ -45 +47 @@
 
 /* Class to implement chat history */
-#ifndef TEST
+#ifndef CHATTEST
 namespace orxonox
 {
@@ -51 +53 @@
 
   /* constructor */
-#ifndef TEST
-  class _OrxonoxExport ChatHistory : public BaseObject, public ChatListener
+#ifndef CHATTEST
+  class _OrxonoxExport ChatHistory : public BaseObject, public ChatListener,
+    public Singleton<ChatHistory>
+
 #else
   class ChatHistory 
@@ -59 +63 @@
     public:
       /* constructors, destructors */
-#ifndef TEST
+#ifndef CHATTEST
       ChatHistory(BaseObject* creator);
+      friend class Singleton<ChatHistory>;
 #else
       ChatHistory();
@@ -102 +107 @@
       std::ofstream hist_logfile;
 
+#ifndef CHATTEST
+      static ChatHistory* singletonPtr_s;
+#endif
 
 
@@ -131 +139 @@
   };
 
-#ifndef TEST
+#ifndef CHATTEST
 }
 #endif