Changeset 10362 for code/branches/core7/src/modules

Timestamp:

Apr 12, 2015, 11:07:14 PM (9 years ago)

Author:

landauf

Message:

use static identifier initializer to store the inheritance definition of abstract classes. this prevents that identifiers are used (via Class(Name)) before they are properly initialized.

Location:

code/branches/core7/src/modules

Files:

• docking/DockingAnimation.cc (modified) (1 diff)
• docking/DockingEffect.cc (modified) (1 diff)
• objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (modified) (1 diff)
• pickup/CollectiblePickup.cc (modified) (1 diff)
• questsystem/Quest.cc (modified) (1 diff)
• questsystem/QuestEffect.cc (modified) (1 diff)
• questsystem/effects/ChangeQuestStatus.cc (modified) (1 diff)

code/branches/core7/src/modules/docking/DockingAnimation.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    RegisterAbstractClass(DockingAnimation).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(DockingAnimation).inheritsFrom<BaseObject>();
 
     DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)

code/branches/core7/src/modules/docking/DockingEffect.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    RegisterAbstractClass(DockingEffect).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(DockingEffect).inheritsFrom<BaseObject>();
 
     DockingEffect::DockingEffect(Context* context) : BaseObject(context)

code/branches/core7/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom(Class(CollisionShape));
+    RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom<CollisionShape>();
 
     /**

code/branches/core7/src/modules/pickup/CollectiblePickup.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    RegisterAbstractClass(CollectiblePickup).inheritsFrom(Class(Pickupable));
+    RegisterAbstractClass(CollectiblePickup).inheritsFrom<Pickupable>();
 
     /**

code/branches/core7/src/modules/questsystem/Quest.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    RegisterAbstractClass(Quest).inheritsFrom(Class(QuestItem));
+    RegisterAbstractClass(Quest).inheritsFrom<QuestItem>();
 
     /**

code/branches/core7/src/modules/questsystem/QuestEffect.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    RegisterAbstractClass(QuestEffect).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(QuestEffect).inheritsFrom<BaseObject>();
 
     /**

code/branches/core7/src/modules/questsystem/effects/ChangeQuestStatus.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
+    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom<QuestEffect>();
 
     /**