Changeset 9667 for code/trunk/src/modules/objects/eventsystem

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/eventsystem/EventDispatcher.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventDispatcher.h (modified) (1 diff)
• src/modules/objects/eventsystem/EventFilter.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventFilter.h (modified) (1 diff)
• src/modules/objects/eventsystem/EventListener.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventListener.h (modified) (1 diff)
• src/modules/objects/eventsystem/EventName.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventName.h (modified) (1 diff)
• src/modules/objects/eventsystem/EventTarget.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventTarget.h (modified) (1 diff)

code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(EventDispatcher);
+    RegisterClass(EventDispatcher);
 
-    EventDispatcher::EventDispatcher(BaseObject* creator) : BaseObject(creator)
+    EventDispatcher::EventDispatcher(Context* context) : BaseObject(context)
     {
         RegisterObject(EventDispatcher);

code/trunk/src/modules/objects/eventsystem/EventDispatcher.h

@@ -46 +46 @@
     {
         public:
-            EventDispatcher(BaseObject* creator);
+            EventDispatcher(Context* context);
             virtual ~EventDispatcher();
 

code/trunk/src/modules/objects/eventsystem/EventFilter.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(EventFilter);
+    RegisterClass(EventFilter);
 
-    EventFilter::EventFilter(BaseObject* creator) : BaseObject(creator)
+    EventFilter::EventFilter(Context* context) : BaseObject(context)
     {
         RegisterObject(EventFilter);

code/trunk/src/modules/objects/eventsystem/EventFilter.h

@@ -46 +46 @@
     {
         public:
-            EventFilter(BaseObject* creator);
+            EventFilter(Context* context);
             virtual ~EventFilter();
 

code/trunk/src/modules/objects/eventsystem/EventListener.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(EventListener);
+    RegisterClass(EventListener);
 
-    EventListener::EventListener(BaseObject* creator) : BaseObject(creator)
+    EventListener::EventListener(Context* context) : BaseObject(context)
     {
         RegisterObject(EventListener);

code/trunk/src/modules/objects/eventsystem/EventListener.h

@@ -47 +47 @@
     {
         public:
-            EventListener(BaseObject* creator);
+            EventListener(Context* context);
             virtual ~EventListener();
 

code/trunk/src/modules/objects/eventsystem/EventName.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    CreateFactory(EventName);
+    RegisterClass(EventName);
 
-    EventName::EventName(BaseObject* creator) : BaseObject(creator)
+    EventName::EventName(Context* context) : BaseObject(context)
     {
         RegisterObject(EventName);

code/trunk/src/modules/objects/eventsystem/EventName.h

@@ -45 +45 @@
     {
         public:
-            EventName(BaseObject* creator);
+            EventName(Context* context);
             virtual ~EventName() {}
     };

code/trunk/src/modules/objects/eventsystem/EventTarget.cc

@@ -33 +33 @@
 namespace orxonox
 {
-    CreateFactory(EventTarget);
+    RegisterClass(EventTarget);
 
-    EventTarget::EventTarget(BaseObject* creator) : BaseObject(creator)
+    EventTarget::EventTarget(Context* context) : BaseObject(context)
     {
         RegisterObject(EventTarget);

code/trunk/src/modules/objects/eventsystem/EventTarget.h

@@ -46 +46 @@
     {
         public:
-            EventTarget(BaseObject* creator);
+            EventTarget(Context* context);
             virtual ~EventTarget();