Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use keywords and and not for variables.

Browse Source
This commit is contained in:
Fredrik Holmqvist 2015-07-23 10:44:03 +02:00
parent 2fb7433b58
commit 8a9464f30c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/servers/launch/Conditions.cpp
View File

@ -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;
}