Don't use keywords and and not for variables.

haiku · Jul 23, 2015 · 8a9464f · 8a9464f
1 parent 2fb7433
commit 8a9464f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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<AndCondition*>(condition);
-	if (and == NULL)
-		and = new AndCondition();
-	if (and != condition && condition != NULL)
-		and->AddCondition(condition);
+	AndCondition* andCondition = dynamic_cast<AndCondition*>(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;
 }