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 /samplecode/OverView.cpp | |
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 'samplecode/OverView.cpp')
-rw-r--r-- | samplecode/OverView.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp index fec7fb39fb..5346c1a18c 100644 --- a/samplecode/OverView.cpp +++ b/samplecode/OverView.cpp @@ -24,8 +24,8 @@ public: protected: // Overridden from SkEventSink: - virtual bool onEvent(const SkEvent&) SK_OVERRIDE; - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onEvent(const SkEvent&) SK_OVERRIDE; + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Overview"); return true; @@ -38,18 +38,18 @@ protected: // Overridden from SkView: - virtual void onSizeChange() SK_OVERRIDE; - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onSizeChange() SK_OVERRIDE; + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorLTGRAY); } - virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; + SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; - virtual bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { return false; } - virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { int ix = (int)(SkScalarDiv(x * N, kWidth)); int iy = (int)(SkScalarDiv(y * N, kHeight)); if (ix >= 0 && iy >= 0) { |