From 35059a549cdaae2f085c0a93ea3280f347d562f6 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Thu, 23 Jul 2015 12:03:30 +0200 Subject: [PATCH] Or is also a keyword. --- src/servers/launch/Events.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/servers/launch/Events.cpp b/src/servers/launch/Events.cpp index 6642f66639..4454ae49db 100644 --- a/src/servers/launch/Events.cpp +++ b/src/servers/launch/Events.cpp @@ -476,19 +476,19 @@ Events::FromMessage(const BMessenger& target, const BMessage& message) /*static*/ Event* Events::AddOnDemand(Event* event) { - OrEvent* or = dynamic_cast(event); - if (or == NULL) { + OrEvent* orEvent = dynamic_cast(event); + if (orEvent == NULL) { EventContainer* container = dynamic_cast(event); if (container == NULL) return NULL; - or = new OrEvent(container->Owner(), container->Target()); + orEvent = new OrEvent(container->Owner(), container->Target()); } - if (or != event && event != NULL) - or->AddEvent(event); + if (orEvent != event && event != NULL) + orEvent->AddEvent(event); - or->AddEvent(new DemandEvent(or)); - return or; + orEvent->AddEvent(new DemandEvent(orEvent)); + return orEvent; }