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
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp
index fec7fb3..5346c1a 100644
--- a/samplecode/OverView.cpp
+++ b/samplecode/OverView.cpp
@@ -24,8 +24,8 @@
protected:
// Overridden from SkEventSink:
- virtual bool onEvent(const SkEvent&) SK_OVERRIDE;
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent&) SK_OVERRIDE;
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Overview");
return true;
@@ -38,18 +38,18 @@
// Overridden from SkView:
- virtual void onSizeChange() SK_OVERRIDE;
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onSizeChange() SK_OVERRIDE;
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawColor(SK_ColorLTGRAY);
}
- virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
+ SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
- virtual bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
return false;
}
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
int ix = (int)(SkScalarDiv(x * N, kWidth));
int iy = (int)(SkScalarDiv(y * N, kHeight));
if (ix >= 0 && iy >= 0) {