Style Change: NULL->nullptr

src/animator/SkMemberInfo.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkMemberInfo_DEFINED
@@ skipping 14 matching lines @@
 
 // temporary hacks until name change is more complete
 #define SkFloat SkScalar
 #define SkInt SkS32
 
 struct SkMemberInfo {
     //!!! alternative:
     // if fCount == 0, record is member property
     // then fType can be type, so caller doesn't have to check
 #if SK_USE_CONDENSED_INFO == 0
-    const char* fName;  // may be NULL for anonymous functions
+    const char* fName;  // may be nullptr for anonymous functions
     size_t fOffset; // if negative, is index into member pointer table (for properties and functions)
     SkDisplayTypes fType;
     int fCount;         // for properties, actual type (count is always assumed to be 1)
 #else
     unsigned char fName;
     signed char fOffset;
     unsigned char fType;
     signed char fCount;
 #endif
     SkDisplayTypes arrayType() const {
@@ skipping 176 matching lines @@
 
 #else
 
 #define DECLARE_PRIVATE_MEMBER_INFO(_type) \
 public: \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_DRAW_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef SkDraw##_type BASE_CLASS
 
 #define DECLARE_DISPLAY_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef SkDisplay##_type BASE_CLASS
 
 #define DECLARE_EXTRAS_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, fType, &name); } \
+        return SkDisplayType::GetMember(nullptr, fType, &name); } \
     SkDisplayTypes fType; \
     virtual SkDisplayTypes getType() const { return fType; } \
     typedef _type BASE_CLASS
 
 #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
 public: \
     typedef Sk##_type BASE_CLASS
 
 #define DEFINE_GET_MEMBER(_class)
 #define DEFINE_NO_VIRTUALS_GET_MEMBER(_class)
 
 #endif
 
 #endif // SkMemberInfo_DEFINED