Fix up all the easy virtual ... SK_OVERRIDE cases.

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 132 matching lines @@
 #define SK_MEMBER_PROPERTY(_member, _type) \
     {#_member, (size_t) (-1 - SK_PROPERTY(_member)), SkType_MemberProperty, \
     (int) SkType_##_type }
 
 #if SK_USE_CONDENSED_INFO == 0
 
 #define DECLARE_PRIVATE_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_DRAW_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef SkDraw##_type BASE_CLASS
 
 #define DECLARE_DISPLAY_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef SkDisplay##_type BASE_CLASS
 
 #define DECLARE_EMPTY_MEMBER_INFO(_type) \
 public: \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
 
 #define DECLARE_EXTRAS_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
     SkDisplayTypes fType; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
+    SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
     typedef _type BASE_CLASS
 
 #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
     typedef Sk##_type BASE_CLASS
 
 #define DEFINE_GET_MEMBER(_class) \
     const SkMemberInfo* _class::getMember(int index) { \
@@ skipping 55 matching lines @@
 #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