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/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index bcbad99..3fb335f 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -47,7 +47,7 @@
}
}
- virtual void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE {
+ void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE {
if (tileSize != fTileSize) {
fTileSize = tileSize;
}
@@ -55,7 +55,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SkString name("P:");
const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
@@ -77,7 +77,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent& evt) SK_OVERRIDE {
if (evt.isType("PictFileView::toggleBBox")) {
fBBox = (BBoxType)((fBBox + 1) % kBBoxTypeCount);
return true;
@@ -85,7 +85,7 @@
return this->INHERITED::onEvent(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount);
SkPicture** picture = fPictures + fBBox;