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/SampleRepeatTile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samplecode/SampleRepeatTile.cpp') diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp index fbbc4722a0..bfdfab8c19 100644 --- a/samplecode/SampleRepeatTile.cpp +++ b/samplecode/SampleRepeatTile.cpp @@ -49,7 +49,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, "RepeatTile"); return true; @@ -57,7 +57,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; make_paint(&paint, SkShader::kRepeat_TileMode); @@ -66,13 +66,13 @@ protected: canvas->drawPaint(paint); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { this->inval(NULL); 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