Changeset 9667 for code/trunk/src/modules/notifications/dispatchers

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/notifications/dispatchers/CommandNotification.cc (modified) (2 diffs)
• src/modules/notifications/dispatchers/CommandNotification.h (modified) (1 diff)
• src/modules/notifications/dispatchers/SimpleNotification.cc (modified) (2 diffs)
• src/modules/notifications/dispatchers/SimpleNotification.h (modified) (1 diff)

code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc

@@ -44 +44 @@
 namespace orxonox {
 
-    CreateFactory(CommandNotification);
+    RegisterClass(CommandNotification);
 
     /**
@@ -50 +50 @@
         Default Constructor. Registers the object and initializes variables.
     */
-    CommandNotification::CommandNotification(BaseObject* creator) : NotificationDispatcher(creator)
+    CommandNotification::CommandNotification(Context* context) : NotificationDispatcher(context)
     {
         RegisterObject(CommandNotification);

code/trunk/src/modules/notifications/dispatchers/CommandNotification.h

@@ -70 +70 @@
 
         public:
-            CommandNotification(BaseObject* creator); //!< Default Constructor.
+            CommandNotification(Context* context); //!< Default Constructor.
             virtual ~CommandNotification(); //!< Destructor.
 

code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc

@@ -39 +39 @@
 namespace orxonox {
 
-    CreateFactory(SimpleNotification);
+    RegisterClass(SimpleNotification);
 
     /**
@@ -45 +45 @@
         Default Constructor. Registers the object and initializes variables.
     */
-    SimpleNotification::SimpleNotification(BaseObject* creator) : NotificationDispatcher(creator)
+    SimpleNotification::SimpleNotification(Context* context) : NotificationDispatcher(context)
     {
         RegisterObject(SimpleNotification);

code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h

@@ -67 +67 @@
     {
         public:
-            SimpleNotification(BaseObject* creator); //!< Default Constructor.
+            SimpleNotification(Context* context); //!< Default Constructor.
             virtual ~SimpleNotification(); //!< Destructor.