Cleanup: More override fixes - another round.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=reed@google.com
Review URL: https://codereview.chromium.org/831113002
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 54858de..70105d2 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -219,7 +219,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Regions");
return true;
@@ -321,7 +321,7 @@
canvas->drawPath(path, paint);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
if (false) { // avoid bit rot, suppress warning
test_strokerect(canvas);
return;
@@ -399,7 +399,7 @@
SkScalarRoundToInt(y)) ? new Click(this) : NULL;
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
fRect.offset(click->fICurr.fX - click->fIPrev.fX,
click->fICurr.fY - click->fIPrev.fY);
this->inval(NULL);
diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp
index b352894..fbbc472 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp
@@ -49,7 +49,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "RepeatTile");
return true;
@@ -57,7 +57,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
make_paint(&paint, SkShader::kRepeat_TileMode);
@@ -72,7 +72,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleRotateCircles.cpp b/samplecode/SampleRotateCircles.cpp
index 06350ab..0687b06 100644
--- a/samplecode/SampleRotateCircles.cpp
+++ b/samplecode/SampleRotateCircles.cpp
@@ -128,7 +128,7 @@
canvas->drawBitmap(bm, 0, 0, NULL);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkScalar radius = 256;
canvas->translate(10, 10);
@@ -244,7 +244,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onSizeChange() {
+ virtual 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 @@
canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPath path;
SkScalar width = fWidth;
@@ -450,7 +450,7 @@
return (SkIntToScalar(y) - control.fTop) / control.height() * (max - min) + min;
}
- virtual bool onClick(Click* click) {
+ virtual 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),
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 253388d..0e70a3e 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -83,7 +83,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Shaders");
return true;
@@ -91,7 +91,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawBitmap(fBitmap, 0, 0);
canvas->translate(SkIntToScalar(20), SkIntToScalar(120));
@@ -127,7 +127,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index 6bc9a28..603714a 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -697,7 +697,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Slides");
return true;
@@ -705,7 +705,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
this->init();
gProc[fIndex](canvas);
}
diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index 4526512..ab75fb3 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -124,7 +124,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "StrokePath");
return true;
@@ -146,7 +146,7 @@
}
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
test_huge_stroke(canvas); return;
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 7f872a9..82fee4a 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -115,7 +115,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Text");
return true;
@@ -143,7 +143,7 @@
pts[i].set(rand->nextUScalar1() * 640, rand->nextUScalar1() * 480);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkAutoCanvasRestore restore(canvas, false);
{
SkRect r;
@@ -192,7 +192,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index 3f4e0db..f5c8e9d 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -36,7 +36,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "TextAlpha");
return true;
@@ -44,7 +44,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
const char* str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
SkPaint paint;
SkScalar x = SkIntToScalar(10);
@@ -73,7 +73,7 @@
return new Click(this);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
int y = click->fICurr.fY;
if (y < 0) {
y = 0;
diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp
index 6d79e20..2ba387a 100644
--- a/samplecode/SampleTextOnPath.cpp
+++ b/samplecode/SampleTextOnPath.cpp
@@ -105,7 +105,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Text On Path");
return true;
@@ -113,7 +113,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(48));
@@ -157,7 +157,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 1e568f5..748c5a6 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -77,7 +77,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Vertices");
return true;
@@ -87,7 +87,7 @@
SkScalar fScale;
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setDither(true);
paint.setFilterLevel(SkPaint::kLow_FilterLevel);
@@ -123,7 +123,7 @@
return new Click(this);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
// fCurrX = click->fICurr.fX;
// fCurrY = click->fICurr.fY;
this->inval(NULL);