diff options
| author | mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
| commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
| tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /samplecode/SampleRotateCircles.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/SampleRotateCircles.cpp')
| -rw-r--r-- | samplecode/SampleRotateCircles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SampleRotateCircles.cpp b/samplecode/SampleRotateCircles.cpp index 0687b0696e..139c23c9b5 100644 --- a/samplecode/SampleRotateCircles.cpp +++ b/samplecode/SampleRotateCircles.cpp @@ -96,7 +96,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "RotateCircles2"); return true; @@ -128,7 +128,7 @@ protected: canvas->drawBitmap(bm, 0, 0, NULL); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkScalar radius = 256; canvas->translate(10, 10); @@ -236,7 +236,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "RotateCircles3"); return true; @@ -244,7 +244,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onSizeChange() SK_OVERRIDE { + void onSizeChange() SK_OVERRIDE { fErrorControl.setXYWH(this->width() - 100, 30, 30, 400); fWidthControl.setXYWH(this->width() - 50, 30, 30, 400); fCubicButton.fBounds.setXYWH(this->width() - 50, 450, 30, 30); @@ -350,7 +350,7 @@ protected: canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPath path; SkScalar width = fWidth; @@ -450,7 +450,7 @@ protected: return (SkIntToScalar(y) - control.fTop) / control.height() * (max - min) + min; } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { int index = ((MyClick*)click)->fIndex; if (index < (int) SK_ARRAY_COUNT(fPts)) { fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX), |
