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

Timestamp:

Mar 26, 2013, 11:43:43 PM (12 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

Files:

• core/Core.h (modified) (1 diff)
• core/ViewportEventListener.h (modified) (1 diff)
• core/WindowEventListener.h (modified) (1 diff)
• core/XMLNameListener.h (modified) (1 diff)
• core/command/IOConsolePOSIX.cc (modified) (1 diff)
• core/command/IOConsoleWindows.cc (modified) (1 diff)
• core/input/InputManager.cc (modified) (1 diff)
• core/input/JoyStickQuantityListener.h (modified) (1 diff)
• network/ClientConnectionListener.h (modified) (1 diff)
• network/NetworkChatListener.h (modified) (2 diffs)
• network/NetworkFunction.cc (modified) (1 diff)
• network/NetworkFunction.h (modified) (2 diffs)
• tools/interfaces/TimeFactorListener.h (modified) (1 diff)

code/branches/core6/src/libraries/core/Core.h

@@ -47 +47 @@
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
 
 namespace orxonox
 {
     //! Informs about changes in the Development Mode.
-    class DevModeListener : virtual public OrxonoxClass
+    class DevModeListener : virtual public Listable
     {
     public:

code/branches/core6/src/libraries/core/ViewportEventListener.h

@@ -33 +33 @@
 
 #include "util/OgreForwardRefs.h"
-#include "class/OrxonoxClass.h"
+#include "object/Listable.h"
 
 namespace orxonox
 {
-    class _CoreExport ViewportEventListener : virtual public OrxonoxClass
+    class _CoreExport ViewportEventListener : virtual public Listable
     {
         public:

code/branches/core6/src/libraries/core/WindowEventListener.h

@@ -36 +36 @@
 
 #include "CorePrereqs.h"
-#include "class/OrxonoxClass.h"
+#include "object/Listable.h"
 
 namespace orxonox
 {
     //! Interface for receiving window events like resize, moved and focusChanged
-    class _CoreExport WindowEventListener : virtual public OrxonoxClass
+    class _CoreExport WindowEventListener : virtual public Listable
     {
         friend class OgreWindowEventListener;

code/branches/core6/src/libraries/core/XMLNameListener.h

@@ -36 +36 @@
 
 #include "CorePrereqs.h"
-#include "class/OrxonoxClass.h"
+#include "object/Listable.h"
 
 namespace orxonox
 {
-    class _CoreExport XMLNameListener : virtual public OrxonoxClass
+    class _CoreExport XMLNameListener : virtual public Listable
     {
         public:

code/branches/core6/src/libraries/core/command/IOConsolePOSIX.cc

@@ -99 +99 @@
 
         resetTerminalMode();
-        this->shell_->destroy();
+        delete this->shell_;
 
         // Restore this->cout_ redirection

code/branches/core6/src/libraries/core/command/IOConsoleWindows.cc

@@ -113 +113 @@
 
         resetTerminalMode();
-        this->shell_->destroy();
+        delete this->shell_;
     }
 

code/branches/core6/src/libraries/core/input/InputManager.cc

@@ -642 +642 @@
         assert(state && this->activeStates_.find(state->getPriority()) == this->activeStates_.end());
         statesByName_.erase(state->getName());
-        state->destroy();
+        delete state;
     }
 

code/branches/core6/src/libraries/core/input/JoyStickQuantityListener.h

@@ -38 +38 @@
 
 #include <vector>
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
     //! Derive from this class to get informed when joy sticks get added/removed
-    class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
+    class _CoreExport JoyStickQuantityListener : virtual public Listable
     {
         friend class InputManager;

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);

code/branches/core6/src/libraries/tools/interfaces/TimeFactorListener.h

@@ -31 +31 @@
 
 #include "tools/ToolsPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
-    class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
+    class _ToolsExport TimeFactorListener : virtual public Listable
     {
         public: