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 --- gm/gm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/gm.h') diff --git a/gm/gm.h b/gm/gm.h index 9ba9f452a7..703fc90451 100644 --- a/gm/gm.h +++ b/gm/gm.h @@ -27,11 +27,11 @@ // See colorwheel.cpp for example usage. #define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \ class SK_MACRO_CONCAT(NAME, _GM) : public skiagm::GM { \ - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE; \ - virtual SkISize onISize() SK_OVERRIDE { \ + void onDraw(SkCanvas* canvas) SK_OVERRIDE; \ + SkISize onISize() SK_OVERRIDE { \ return SkISize::Make((W), (H)); \ } \ - virtual SkString onShortName() SK_OVERRIDE { \ + SkString onShortName() SK_OVERRIDE { \ return SkString(#NAME); \ } \ }; \ -- cgit v1.2.3