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/SampleUnpremul.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'samplecode/SampleUnpremul.cpp') diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp index ffe4428b48..9591fec159 100644 --- a/samplecode/SampleUnpremul.cpp +++ b/samplecode/SampleUnpremul.cpp @@ -51,7 +51,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, "unpremul"); return true; @@ -77,14 +77,14 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { + void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref shader(createChecker()); paint.setShader(shader.get()); canvas->drawPaint(paint); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(24)); -- cgit v1.2.3