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 --- bench/DashBench.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'bench/DashBench.cpp') diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp index f4d09c66f2..5f209698de 100644 --- a/bench/DashBench.cpp +++ b/bench/DashBench.cpp @@ -57,11 +57,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); paint.setStyle(SkPaint::kStroke_Style); @@ -190,11 +190,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkPath dst; for (int i = 0; i < loops; ++i) { SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle); @@ -228,11 +228,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); paint.setStrokeWidth(fStrokeWidth); @@ -267,11 +267,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); @@ -353,11 +353,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setStyle(SkPaint::kStroke_Style); @@ -393,11 +393,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); -- cgit v1.2.3