diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
| commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
| tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /src/animator/SkMemberInfo.h | |
| parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (diff) | |
Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases. We'll have to manually clean up the rest
over time unless I level up in regexes.
for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end
BUG=skia:
Review URL: https://codereview.chromium.org/806653007
Diffstat (limited to 'src/animator/SkMemberInfo.h')
| -rw-r--r-- | src/animator/SkMemberInfo.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h index cf4b0a85be..c0d9e2087a 100644 --- a/src/animator/SkMemberInfo.h +++ b/src/animator/SkMemberInfo.h @@ -150,49 +150,49 @@ struct SkMemberInfo { 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) \ |