From 8a9464f30ca0e7aa6e8002afd90045964e033d78 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Thu, 23 Jul 2015 10:44:03 +0200 Subject: [PATCH] Don't use keywords and and not for variables. --- src/servers/launch/Conditions.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/servers/launch/Conditions.cpp b/src/servers/launch/Conditions.cpp index 6eb3b6ecc5..44a5164f0d 100644 --- a/src/servers/launch/Conditions.cpp +++ b/src/servers/launch/Conditions.cpp @@ -458,15 +458,15 @@ Conditions::FromMessage(const BMessage& message) /*static*/ Condition* Conditions::AddNotSafeMode(Condition* condition) { - AndCondition* and = dynamic_cast(condition); - if (and == NULL) - and = new AndCondition(); - if (and != condition && condition != NULL) - and->AddCondition(condition); + AndCondition* andCondition = dynamic_cast(condition); + if (andCondition == NULL) + andCondition = new AndCondition(); + if (andCondition != condition && condition != NULL) + andCondition->AddCondition(condition); - NotCondition* not = new NotCondition(); - not->AddCondition(new SafeModeCondition()); + NotCondition* notCondition = new NotCondition(); + notCondition->AddCondition(new SafeModeCondition()); - and->AddCondition(not); - return and; + andCondition->AddCondition(notCondtion); + return andCondition; }