Style Change: NULL->nullptr

src/animator/SkDisplayEvent.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDisplayEvent.h"
@@ skipping 27 matching lines @@
     SK_MEMBER(target, String),
     SK_MEMBER(x, Float),
     SK_MEMBER(y, Float)
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkDisplayEvent);
 
 SkDisplayEvent::SkDisplayEvent() : code((SkKey) -1), disable(false),
-    kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(NULL) {
+    kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(nullptr) {
 }
 
 SkDisplayEvent::~SkDisplayEvent() {
     deleteMembers();
 }
 
 bool SkDisplayEvent::addChild(SkAnimateMaker& , SkDisplayable* child) {
     *fChildren.append() = child;
     return true;
 }
 
 bool SkDisplayEvent::contains(SkDisplayable* match) {
     for (int index = 0; index < fChildren.count(); index++) {
         if (fChildren[index] == match || fChildren[index]->contains(match))
             return true;
     }
     return false;
 }
 
 SkDisplayable* SkDisplayEvent::contains(const SkString& match) {
     for (int index = 0; index < fChildren.count(); index++) {
         SkDisplayable* child = fChildren[index];
         if (child->contains(match))
             return child;
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkDisplayEvent::deleteMembers() {
     for (int index = 0; index < fChildren.count(); index++) {
         SkDisplayable* evt = fChildren[index];
         delete evt;
     }
 }
 
 #ifdef SK_DUMP_ENABLED
 void SkDisplayEvent::dumpEvent(SkAnimateMaker* maker) {
     dumpBase(maker);
     SkString str;
     SkDump::GetEnumString(SkType_EventKind, kind, &str);
     SkDebugf("kind=\"%s\" ", str.c_str());
     if (kind == SkDisplayEvent::kKeyPress || kind == SkDisplayEvent::kKeyPressUp) {
         if (code >= 0)
             SkDump::GetEnumString(SkType_EventCode, code, &str);
         else
             str.set("none");
         SkDebugf("code=\"%s\" ", str.c_str());
     }
     if (kind == SkDisplayEvent::kKeyChar) {
         if (fMax != (SkKey) -1 && fMax != code)
             SkDebugf("keys=\"%c - %c\" ", code, fMax);
         else
             SkDebugf("key=\"%c\" ", code);
     }
-    if (fTarget != NULL) {
+    if (fTarget != nullptr) {
         SkDebugf("target=\"%s\" ", fTarget->id);
     }
     if (kind >= SkDisplayEvent::kMouseDown && kind <= SkDisplayEvent::kMouseUp) {
         SkDebugf("x=\"%g\" y=\"%g\" ", SkScalarToFloat(x), SkScalarToFloat(y));
     }
     if (disable)
         SkDebugf("disable=\"true\" ");
     SkDebugf("/>\n");
 }
 #endif
@@ skipping 67 matching lines @@
         animate->setHasEndEvent();
     }
 }
 
 void SkDisplayEvent::populateInput(SkAnimateMaker& maker, const SkEvent& fEvent) {
     const SkMetaData& meta = fEvent.getMetaData();
     SkMetaData::Iter iter(meta);
     SkMetaData::Type    type;
     int number;
     const char* name;
-    while ((name = iter.next(&type, &number)) != NULL) {
+    while ((name = iter.next(&type, &number)) != nullptr) {
         if (name[0] == '\0')
             continue;
         SkDisplayable* displayable;
         SkInput* input;
         for (int index = 0; index < fChildren.count(); index++) {
             displayable = fChildren[index];
             if (displayable->getType() != SkType_Input)
                 continue;
             input = (SkInput*) displayable;
             if (input->name.equals(name))
@@ skipping 41 matching lines @@
     fMax = code;
     SkASSERT(count == 1 || index == SK_PROPERTY(keys));
     if (--count > 0) {
         SkASSERT(*chars == '-');
         chars++;
         fMax = (SkKey) SkUTF8_NextUnichar(&chars);
         SkASSERT(fMax >= code);
     }
     return true;
 }