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

Timestamp:

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

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/notifications/NotificationDispatcher.cc (modified) (2 diffs)
• src/modules/notifications/NotificationDispatcher.h (modified) (1 diff)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)
• src/modules/notifications/NotificationManager.h (modified) (1 diff)
• src/modules/notifications/NotificationQueue.cc (modified) (2 diffs)
• src/modules/notifications/NotificationQueue.h (modified) (1 diff)
• src/modules/notifications/NotificationQueueCEGUI.cc (modified) (1 diff)
• src/modules/notifications/NotificationQueueCEGUI.h (modified) (1 diff)
• 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/NotificationDispatcher.cc ¶

@@ -48 +48 @@
 {
 
-    CreateUnloadableFactory(NotificationDispatcher);
+    RegisterUnloadableClass(NotificationDispatcher);
 
     registerMemberNetworkFunction(NotificationDispatcher, broadcastHelper);
@@ -57 +57 @@
         Default constructor. Initializes the object.
     */
-    NotificationDispatcher::NotificationDispatcher(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    NotificationDispatcher::NotificationDispatcher(Context* context) : BaseObject(context), Synchronisable(context)
     {
         RegisterObject(NotificationDispatcher);

code/trunk/src/modules/notifications/NotificationDispatcher.h ¶

@@ -76 +76 @@
     {
         public:
-            NotificationDispatcher(BaseObject* creator); //!< Default constructor. Initializes the object.
+            NotificationDispatcher(Context* context); //!< Default constructor. Initializes the object.
             virtual ~NotificationDispatcher(); //!< Destructor.
 

code/trunk/src/modules/notifications/NotificationManager.cc ¶

@@ -55 +55 @@
     NotificationManager::NotificationManager()
     {
-        RegisterRootObject(NotificationManager);
+        RegisterObject(NotificationManager);
 
         orxout(internal_info, context::notifications) << "NotificatioManager created." << endl;

code/trunk/src/modules/notifications/NotificationManager.h ¶

@@ -42 +42 @@
 #include <string>
 
-#include "core/OrxonoxClass.h"
 #include "util/Singleton.h"
 #include "interfaces/NotificationListener.h"

code/trunk/src/modules/notifications/NotificationQueue.cc ¶

@@ -44 +44 @@
 {
 
-    CreateFactory(NotificationQueue);
+    RegisterClass(NotificationQueue);
 
     /**
@@ -52 +52 @@
         The creator of the NotificationQueue.
     */
-    NotificationQueue::NotificationQueue(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), registered_(false)
+    NotificationQueue::NotificationQueue(Context* context) : BaseObject(context), Synchronisable(context), registered_(false)
     {
         RegisterObject(NotificationQueue);

code/trunk/src/modules/notifications/NotificationQueue.h ¶

@@ -94 +94 @@
 
         public:
-            NotificationQueue(BaseObject* creator);
+            NotificationQueue(Context* context);
             virtual ~NotificationQueue();
 

code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc ¶

@@ -46 +46 @@
 {
 
-    CreateFactory(NotificationQueueCEGUI);
+    RegisterClass(NotificationQueueCEGUI);
 
     /*static*/ const std::string NotificationQueueCEGUI::NOTIFICATION_LAYER("NotificationLayer");
 
-    NotificationQueueCEGUI::NotificationQueueCEGUI(BaseObject* creator) : NotificationQueue(creator)
+    NotificationQueueCEGUI::NotificationQueueCEGUI(Context* context) : NotificationQueue(context)
     {
         RegisterObject(NotificationQueueCEGUI);

code/trunk/src/modules/notifications/NotificationQueueCEGUI.h ¶

@@ -70 +70 @@
 
         public:
-            NotificationQueueCEGUI(BaseObject* creator);
+            NotificationQueueCEGUI(Context* context);
             virtual ~NotificationQueueCEGUI();
 

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.