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

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/core

Files:

• Core.h (modified) (1 diff)
• ViewportEventListener.h (modified) (1 diff)
• WindowEventListener.h (modified) (1 diff)
• XMLNameListener.h (modified) (1 diff)
• command/IOConsolePOSIX.cc (modified) (1 diff)
• command/IOConsoleWindows.cc (modified) (1 diff)
• input/InputManager.cc (modified) (1 diff)
• input/JoyStickQuantityListener.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;