Changeset 9667 for code/trunk/src/orxonox/chat

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/chat/ChatHistory.cc (modified) (1 diff)
• src/orxonox/chat/ChatListener.h (modified) (2 diffs)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)

code/trunk/src/orxonox/chat/ChatHistory.cc

@@ -39 +39 @@
   /* constructor */
 #ifndef CHATTEST
-  //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
   ChatHistory::ChatHistory()
 #else

code/trunk/src/orxonox/chat/ChatListener.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
@@ -40 +40 @@
         message was sent through ChatManager.
     */
-    class _OrxonoxExport ChatListener : virtual public OrxonoxClass
+    class _OrxonoxExport ChatListener : virtual public Listable
     {
         friend class ChatManager;

code/trunk/src/orxonox/chat/ChatManager.cc

@@ -113 +113 @@
     // ChatListener                                                         //
     //////////////////////////////////////////////////////////////////////////
+    RegisterAbstractClass(ChatListener).inheritsFrom(Class(Listable));
 
     ChatListener::ChatListener()
     {
-        RegisterRootObject(ChatListener);
+        RegisterObject(ChatListener);
     }
 }