Changeset 9589 for code/branches/core6/src/libraries/network

Timestamp:

Mar 26, 2013, 11:43:43 PM (11 years ago)

Author:

landauf

Message:

interfaces which are part of the framework and only rely on the object list for calling all instances may inherit from Listable

Location:

code/branches/core6/src/libraries/network

Files:

• ClientConnectionListener.h (modified) (1 diff)
• NetworkChatListener.h (modified) (2 diffs)
• NetworkFunction.cc (modified) (1 diff)
• NetworkFunction.h (modified) (2 diffs)

code/branches/core6/src/libraries/network/ClientConnectionListener.h

@@ -31 +31 @@
 
 #include "NetworkPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
-    class _NetworkExport ClientConnectionListener : virtual public OrxonoxClass
+    class _NetworkExport ClientConnectionListener : virtual public Listable
     {
         public:

code/branches/core6/src/libraries/network/NetworkChatListener.h

@@ -32 +32 @@
 #include "NetworkPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
@@ -43 +43 @@
         in Host and ChatManager. ChatManager is the main derivative of this interface.
     */
-    class _NetworkExport NetworkChatListener : virtual public OrxonoxClass
+    class _NetworkExport NetworkChatListener : virtual public Listable
     {
         friend class Host;

code/branches/core6/src/libraries/network/NetworkFunction.cc

@@ -57 +57 @@
     std::map<std::string, NetworkFunctionBase*>::iterator it;
     for( it=map.begin(); it!=map.end(); ++it )
-      it->second->destroy();
+      delete it->second;
   }
 

code/branches/core6/src/libraries/network/NetworkFunction.h

@@ -39 +39 @@
 #include <boost/static_assert.hpp>
 
+#include "core/object/Listable.h"
 #include "core/class/Identifier.h"
 #include "core/command/Functor.h"
@@ -70 +71 @@
 
 
-class _NetworkExport NetworkFunctionBase: virtual public OrxonoxClass {
+class _NetworkExport NetworkFunctionBase: virtual public Listable {
   public:
     NetworkFunctionBase(const std::string& name);