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

Timestamp:

Mar 25, 2013, 11:05:13 PM (12 years ago)

Author:

landauf

Message:

made some classes (mostly singletons) inherit from Configurable instead of OrxonoxClass when they only need the config value facilities

Location:

code/branches/core6/src/libraries/core

Files:

• Core.h (modified) (1 diff)
• Game.h (modified) (2 diffs)
• GraphicsManager.h (modified) (2 diffs)
• command/Shell.cc (modified) (1 diff)
• input/InputBuffer.h (modified) (2 diffs)
• input/InputManager.cc (modified) (1 diff)
• input/KeyBinderManager.h (modified) (2 diffs)

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

@@ -66 +66 @@
         You should only create this singleton once because it destroys the identifiers!
     */
-    class _CoreExport Core : public Singleton<Core>, public OrxonoxClass
+    class _CoreExport Core : public Singleton<Core>, public Configurable
     {
         friend class Singleton<Core>;

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

@@ -50 +50 @@
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
 
 /**
@@ -82 +82 @@
     class _CoreExport Game
 // tolua_end
-        : public Singleton<Game>, public OrxonoxClass
+        : public Singleton<Game>, public Configurable
     { // tolua_export
         friend class Singleton<Game>;

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

@@ -52 +52 @@
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
 
 // tolua_begin
@@ -63 +63 @@
     class _CoreExport GraphicsManager
 // tolua_end
-        : public Singleton<GraphicsManager>, public OrxonoxClass, public Ogre::LogListener
+        : public Singleton<GraphicsManager>, public Configurable, public Ogre::LogListener
     { // tolua_export
         friend class Singleton<GraphicsManager>;

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

@@ -96 +96 @@
     Shell::~Shell()
     {
-        this->inputBuffer_->destroy();
+        delete this->inputBuffer_;
 
         OutputManager::getInstance().unregisterListener(this);

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

@@ -34 +34 @@
 #include <list>
 #include <string>
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "InputHandler.h"
 
@@ -74 +74 @@
     };
 
-    class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass
+    class _CoreExport InputBuffer : public InputHandler, public Configurable
     {
         public:

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

@@ -280 +280 @@
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
-        calibratorCallbackHandler_->destroy();
+        delete calibratorCallbackHandler_;
         // Destroy the empty InputState
         this->destroyStateInternal(this->emptyState_);

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

@@ -36 +36 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox //tolua_export
@@ -53 +53 @@
     */
     class _CoreExport KeyBinderManager //tolua_export
-        : public Singleton<KeyBinderManager>, public OrxonoxClass
+        : public Singleton<KeyBinderManager>, public Configurable
     { //tolua_export
         friend class Singleton<KeyBinderManager>;