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 --- src/images/SkImageDecoder_pkm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/images/SkImageDecoder_pkm.cpp') diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp index 17ef2f3037..c607c6f852 100644 --- a/src/images/SkImageDecoder_pkm.cpp +++ b/src/images/SkImageDecoder_pkm.cpp @@ -19,12 +19,12 @@ class SkPKMImageDecoder : public SkImageDecoder { public: SkPKMImageDecoder() { } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kPKM_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; -- cgit v1.2.3