Changeset 9578 for code/branches/core6/src/modules

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

Files:

• designtools/ScreenshotManager.h (modified) (2 diffs)
• designtools/SkyboxGenerator.h (modified) (2 diffs)
• questsystem/QuestManager.cc (modified) (2 diffs)
• questsystem/QuestManager.h (modified) (2 diffs)

code/branches/core6/src/modules/designtools/ScreenshotManager.h

@@ -44 +44 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
@@ -61 +61 @@
     @ingroup Designtools
     */
-    class ScreenshotManager : public OrxonoxClass, public Singleton<ScreenshotManager>
+    class ScreenshotManager : public Configurable, public Singleton<ScreenshotManager>
     {
         friend class Singleton<ScreenshotManager>;

code/branches/core6/src/modules/designtools/SkyboxGenerator.h

@@ -36 +36 @@
 #define __SkyboxGenerator_h__
 
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "util/Singleton.h"
 #include "tools/interfaces/Tickable.h"
@@ -58 +58 @@
     @ingroup Designtools
     */
-    class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable
+    class SkyboxGenerator : public virtual Configurable, public Singleton<SkyboxGenerator>, public Tickable
     {
         friend class Singleton<SkyboxGenerator>;

code/branches/core6/src/modules/questsystem/QuestManager.cc

@@ -38 +38 @@
 #include "util/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
-#include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/LuaState.h"
@@ -60 +59 @@
     QuestManager::QuestManager()
     {
-        RegisterRootObject(QuestManager);
         orxout(internal_info, context::quests) << "QuestManager created." << endl;
     }

code/branches/core6/src/modules/questsystem/QuestManager.h

@@ -43 +43 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
 
 namespace orxonox  // tolua_export
@@ -59 +58 @@
     */
     class _QuestsystemExport QuestManager  // tolua_export
-        : public Singleton<QuestManager>, public orxonox::OrxonoxClass
+        : public Singleton<QuestManager>
     { // tolua_export