diff options
author | 2015-01-09 10:06:39 -0800 | |
---|---|---|
committer | 2015-01-09 10:06:40 -0800 | |
commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /samplecode/SampleTextOnPath.cpp | |
parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (diff) |
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
Diffstat (limited to 'samplecode/SampleTextOnPath.cpp')
-rw-r--r-- | samplecode/SampleTextOnPath.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp index 2ba387a32a..ac889c3dae 100644 --- a/samplecode/SampleTextOnPath.cpp +++ b/samplecode/SampleTextOnPath.cpp @@ -105,7 +105,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, "Text On Path"); return true; @@ -113,7 +113,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(48)); @@ -151,13 +151,13 @@ protected: this->inval(NULL); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { fHints += 1; 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); } |