clang-modernize -use-nullptr

and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
This commit is contained in:
Tillmann Karras 2014-03-09 21:14:26 +01:00
parent f28116b7da
commit d802d39281
292 changed files with 1526 additions and 1526 deletions

View file

@ -357,7 +357,7 @@ Device::Control *ControlFinder::FindControl(ControlQualifier qualifier)
{
Device *device = FindDevice(qualifier);
if (!device)
return NULL;
return nullptr;
if (is_input)
return device->FindInput(qualifier.control_name);
@ -414,7 +414,7 @@ private:
case TOK_CONTROL:
{
Device::Control *control = finder.FindControl(tok.qualifier);
if (control == NULL)
if (control == nullptr)
return EXPRESSION_PARSE_NO_DEVICE;
*expr_out = new ControlExpression(tok.qualifier, control);
@ -539,7 +539,7 @@ ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finde
{
ExpressionParseStatus status;
Expression *expr;
*expr_out = NULL;
*expr_out = nullptr;
if (str == "")
return EXPRESSION_PARSE_SUCCESS;