[Orxonox-commit 638] r3170 - in branches/pch/src: core orxonox/objects/quest orxonox/objects/worldentities orxonox/objects/worldentities/triggers

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-14 18:39:17 +0200 (Sun, 14 Jun 2009)
New Revision: 3170

Modified:
   branches/pch/src/core/BaseObject.cc
   branches/pch/src/core/EventIncludes.h
   branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
   branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.cc
   branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.cc
Log:
Build fix: Using boost convention for macros which is all-uppercase and prefixed with ORXONOX_
In this case SetEvent screws winbase.h

Modified: branches/pch/src/core/BaseObject.cc
===================================================================
--- branches/pch/src/core/BaseObject.cc	2009-06-14 16:35:31 UTC (rev 3169)
+++ branches/pch/src/core/BaseObject.cc	2009-06-14 16:39:17 UTC (rev 3170)
@@ -293,8 +293,8 @@
 
     void BaseObject::processEvent(Event& event)
     {
-        SetEvent(BaseObject, "activity", setActive, event);
-        SetEvent(BaseObject, "visibility", setVisible, event);
+        ORXONOX_SET_EVENT(BaseObject, "activity", setActive, event);
+        ORXONOX_SET_EVENT(BaseObject, "visibility", setVisible, event);
     }
 
     void BaseObject::setMainStateName(const std::string& name)

Modified: branches/pch/src/core/EventIncludes.h
===================================================================
--- branches/pch/src/core/EventIncludes.h	2009-06-14 16:35:31 UTC (rev 3169)
+++ branches/pch/src/core/EventIncludes.h	2009-06-14 16:39:17 UTC (rev 3170)
@@ -32,19 +32,19 @@
 #include "CorePrereqs.h"
 #include "Executor.h"
 
-#define SetEvent(classname, eventname, functionname, event) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, functionname, event, BaseObject)
+#define ORXONOX_SET_EVENT(classname, eventname, functionname, event) \
+    ORXONOX_SET_EVENT_GENERIC(eventcontainer##classname##functionname, classname, eventname, functionname, event, BaseObject)
 
-#define SetEventTemplate(classname, eventname, functionname, event, ...) \
-    SetEventGenericTemplate(eventcontainer##classname##functionname, classname, eventname, functionname, event, BaseObject, __VA_ARGS__)
+#define ORXONOX_SET_EVENT_TEMPLATE(classname, eventname, functionname, event, ...) \
+    ORXONOX_SET_EVENT_GENERIC_TEMPLATE(eventcontainer##classname##functionname, classname, eventname, functionname, event, BaseObject, __VA_ARGS__)
 
-#define SetSubclassEvent(classname, eventname, functionname, event, subclassname) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, functionname, event, subclassname)
+#define ORXONOX_SET_SUBCLASS_EVENT(classname, eventname, functionname, event, subclassname) \
+    ORXONOX_SET_EVENT_GENERIC(eventcontainer##classname##functionname, classname, eventname, functionname, event, subclassname)
 
-#define SetSubclassEventTemplate(classname, eventname, functionname, event, subclassname, ...) \
-    SetEventGenericTemplate(eventcontainer##classname##functionname, classname, eventname, functionname, event, subclassname, __VA_ARGS__)
+#define ORXONOX_SET_SUBCLASS_EVENT_TEMPLATE(classname, eventname, functionname, event, subclassname, ...) \
+    ORXONOX_SET_EVENT_GENERIC_TEMPLATE(eventcontainer##classname##functionname, classname, eventname, functionname, event, subclassname, __VA_ARGS__)
 
-#define SetEventGeneric(containername, classname, eventname, functionname, event, subclassname) \
+#define ORXONOX_SET_EVENT_GENERIC(containername, classname, eventname, functionname, event, subclassname) \
     orxonox::EventContainer* containername = this->getEventContainer(eventname); \
     if (!containername) \
     { \
@@ -56,7 +56,7 @@
     event.castedOriginator_ = dynamic_cast<subclassname*>(event.originator_); \
     containername->process(this, event)
 
-#define SetEventGenericTemplate(containername, classname, eventname, functionname, event, subclassname, ...) \
+#define ORXONOX_SET_EVENT_GENERIC_TEMPLATE(containername, classname, eventname, functionname, event, subclassname, ...) \
     orxonox::EventContainer* containername = this->getEventContainer(eventname); \
     if (!containername) \
     { \

Modified: branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc	2009-06-14 16:35:31 UTC (rev 3169)
+++ branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc	2009-06-14 16:39:17 UTC (rev 3170)
@@ -88,7 +88,7 @@
     {
         SUPER(QuestEffectBeacon, processEvent, event);
     
-        SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
+        ORXONOX_SET_SUBCLASS_EVENT(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
     
     /**

Modified: branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.cc	2009-06-14 16:35:31 UTC (rev 3169)
+++ branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.cc	2009-06-14 16:39:17 UTC (rev 3170)
@@ -74,7 +74,7 @@
     {
         SUPER(ParticleSpawner, processEvent, event);
 
-        SetEvent(ParticleSpawner, "spawn", spawn, event);
+        ORXONOX_SET_EVENT(ParticleSpawner, "spawn", spawn, event);
     }
 
     void ParticleSpawner::configure(float lifetime, float startdelay, float destroydelay, bool autodestroy)

Modified: branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.cc	2009-06-14 16:35:31 UTC (rev 3169)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.cc	2009-06-14 16:39:17 UTC (rev 3170)
@@ -50,7 +50,7 @@
     {
         SUPER(EventTrigger, processEvent, event);
 
-        SetEvent(EventTrigger, "trigger", trigger, event);
+        ORXONOX_SET_EVENT(EventTrigger, "trigger", trigger, event);
     }
 
     bool EventTrigger::isTriggered(TriggerMode mode)