From 72c9faab45124e08c85f70ca38536914862d947c Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 9 Jan 2015 10:06:39 -0800 Subject: 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 --- samplecode/SampleShaders.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'samplecode/SampleShaders.cpp') diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index 0e70a3e2d7..5a358c6af9 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -83,7 +83,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Shaders"); return true; @@ -91,7 +91,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { canvas->drawBitmap(fBitmap, 0, 0); canvas->translate(SkIntToScalar(20), SkIntToScalar(120)); @@ -127,7 +127,7 @@ protected: return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { return this->INHERITED::onClick(click); } -- cgit v1.2.3