Changeset 5893

Timestamp:

Oct 6, 2009, 1:55:05 PM (15 years ago)

Author:

landauf

Message:

Removed ambiguity between the EventName macro and the EventName class. The macro is now called FireEventName. (It did work before, but wasn't very nice ofc)

Location:

code/branches/core5/src

Files:

• libraries/core/EventIncludes.h (modified) (1 diff)
• modules/pong/Pong.cc (modified) (1 diff)

code/branches/core5/src/libraries/core/EventIncludes.h

@@ -82 +82 @@
     @brief This macro is needed to fire an event with this name. The event name must previously be declared with @ref CreateEventName.
 */    
-#define EventName(classname, name) \
+#define FireEventName(classname, name) \
     eventname##classname##name
  

code/branches/core5/src/modules/pong/Pong.cc

@@ -160 +160 @@
         {
             if (player == this->getRightPlayer())
-                this->center_->fireEvent(EventName(PongCenterpoint, right));
+                this->center_->fireEvent(FireEventName(PongCenterpoint, right));
             else if (player == this->getLeftPlayer())
-                this->center_->fireEvent(EventName(PongCenterpoint, left));
+                this->center_->fireEvent(FireEventName(PongCenterpoint, left));
             
             if (player)