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/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index 4ba65bd..1e21bad 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -75,7 +75,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect)
protected:
- virtual void begin(const SkIRect& uvBounds, SkPath* dst) const SK_OVERRIDE {
+ void begin(const SkIRect& uvBounds, SkPath* dst) const SK_OVERRIDE {
if (fPts) {
fPts->reset();
}
@@ -90,7 +90,7 @@
dst->addCircle(loc.fX, loc.fY, fRadius);
}
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
buffer.writeMatrix(this->getMatrix());
buffer.writeScalar(fRadius);
}
diff --git a/samplecode/GMSampleView.h b/samplecode/GMSampleView.h
index 40d11ab..c781cd0 100644
--- a/samplecode/GMSampleView.h
+++ b/samplecode/GMSampleView.h
@@ -43,7 +43,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent& evt) SK_OVERRIDE {
if (evt.isType("GMSampleView::showSize")) {
fShowSize = SkToBool(evt.getFast32());
return true;
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) {
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index f5a7c14..537659e 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -168,11 +168,11 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect)
protected:
- virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
+ void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
dst->addCircle(loc.fX, loc.fY, fRadius);
}
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
this->INHERITED::flatten(buffer);
buffer.writeScalar(fRadius);
}
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 29b7d11..6c78810 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -50,7 +50,7 @@
SkString fFilename;
public:
PictFileFactory(const SkString& filename) : fFilename(filename) {}
- virtual SkView* operator() () const SK_OVERRIDE {
+ SkView* operator() () const SK_OVERRIDE {
return CreateSamplePictFileView(fFilename.c_str());
}
};
@@ -62,7 +62,7 @@
SkString fFilename;
public:
PdfFileViewerFactory(const SkString& filename) : fFilename(filename) {}
- virtual SkView* operator() () const SK_OVERRIDE {
+ SkView* operator() () const SK_OVERRIDE {
return CreateSamplePdfFileViewer(fFilename.c_str());
}
};
@@ -344,7 +344,7 @@
#endif
}
- virtual GrRenderTarget* getGrRenderTarget() SK_OVERRIDE {
+ GrRenderTarget* getGrRenderTarget() SK_OVERRIDE {
#if SK_SUPPORT_GPU
return fCurRenderTarget;
#else
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 3980669..3e8afc0 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -101,7 +101,7 @@
SampleWindow(void* hwnd, int argc, char** argv, DeviceManager*);
virtual ~SampleWindow();
- virtual SkSurface* createSurface() SK_OVERRIDE {
+ SkSurface* createSurface() SK_OVERRIDE {
SkSurface* surface = NULL;
if (fDevManager) {
surface = fDevManager->createSurface(fDeviceType, this);
@@ -112,7 +112,7 @@
return surface;
}
- virtual void draw(SkCanvas*) SK_OVERRIDE;
+ void draw(SkCanvas*) SK_OVERRIDE;
void setDeviceType(DeviceType type);
void toggleRendering();
@@ -138,22 +138,22 @@
DeviceType getDeviceType() const { return fDeviceType; }
protected:
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE;
- virtual bool onHandleKey(SkKey key) SK_OVERRIDE;
- virtual bool onHandleChar(SkUnichar) SK_OVERRIDE;
- virtual void onSizeChange() SK_OVERRIDE;
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE;
+ bool onHandleKey(SkKey key) SK_OVERRIDE;
+ bool onHandleChar(SkUnichar) SK_OVERRIDE;
+ void onSizeChange() SK_OVERRIDE;
- virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
- virtual void afterChildren(SkCanvas*) SK_OVERRIDE;
- virtual void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
- virtual void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
+ SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
+ void afterChildren(SkCanvas*) SK_OVERRIDE;
+ void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
+ void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE;
- virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE;
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE;
+ bool onEvent(const SkEvent& evt) SK_OVERRIDE;
+ bool onQuery(SkEvent* evt) SK_OVERRIDE;
virtual bool onDispatchClick(int x, int y, Click::State, void* owner,
unsigned modi) SK_OVERRIDE;
- virtual bool onClick(Click* click) SK_OVERRIDE;
+ bool onClick(Click* click) SK_OVERRIDE;
virtual Click* onFindClickHandler(SkScalar x, SkScalar y,
unsigned modi) SK_OVERRIDE;
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 6943eb7..df452ce 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -99,7 +99,7 @@
fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable();
}
- virtual ~ArcsView() SK_OVERRIDE {
+ ~ArcsView() SK_OVERRIDE {
fAnimatingDrawable->unref();
fRootDrawable->unref();
}
diff --git a/samplecode/SampleChart.cpp b/samplecode/SampleChart.cpp
index 12a6afe..ec5448c 100644
--- a/samplecode/SampleChart.cpp
+++ b/samplecode/SampleChart.cpp
@@ -88,7 +88,7 @@
}
protected:
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Chart");
return true;
@@ -96,7 +96,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
bool sizeChanged = false;
if (canvas->getDeviceSize() != fSize) {
fSize = canvas->getDeviceSize();
diff --git a/samplecode/SampleClock.cpp b/samplecode/SampleClock.cpp
index 17ddc83..651a995 100644
--- a/samplecode/SampleClock.cpp
+++ b/samplecode/SampleClock.cpp
@@ -22,7 +22,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Clock");
return true;
@@ -30,7 +30,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paintFill;
SkPaint paintStroke;
SkPath path;
diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index 93127eb..d09022f 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -60,7 +60,7 @@
class SkFuncViewFactory : public SkViewFactory {
public:
SkFuncViewFactory(SkViewCreateFunc func);
- virtual SkView* operator() () const SK_OVERRIDE;
+ SkView* operator() () const SK_OVERRIDE;
private:
SkViewCreateFunc fCreateFunc;
@@ -79,7 +79,7 @@
class SkGMSampleViewFactory : public SkViewFactory {
public:
SkGMSampleViewFactory(GMFactoryFunc func);
- virtual SkView* operator() () const SK_OVERRIDE;
+ SkView* operator() () const SK_OVERRIDE;
private:
GMFactoryFunc fFunc;
};
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index c300733..9b9af3e 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -404,7 +404,7 @@
}
protected:
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "FatBits");
return true;
@@ -499,7 +499,7 @@
return new IndexClick(this, index);
}
- virtual bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) SK_OVERRIDE {
int index = IndexClick::GetIndex(click);
if (index >= 0 && index <= 2) {
fPts[index] = click->fCurr;
diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp
index a6b5c5c..073bc7c 100644
--- a/samplecode/SampleIdentityScale.cpp
+++ b/samplecode/SampleIdentityScale.cpp
@@ -43,7 +43,7 @@
SkBitmap fBM;
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "IdentityScale");
return true;
@@ -51,7 +51,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 43f5d42..9b61fcc 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -123,7 +123,7 @@
class RedFilter : public SkDrawFilter {
public:
- virtual bool filter(SkPaint* p, SkDrawFilter::Type) SK_OVERRIDE {
+ bool filter(SkPaint* p, SkDrawFilter::Type) SK_OVERRIDE {
fColor = p->getColor();
if (fColor == SK_ColorRED) {
p->setColor(SK_ColorGREEN);
diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp
index edb52fe..c2509bc 100644
--- a/samplecode/SampleLines.cpp
+++ b/samplecode/SampleLines.cpp
@@ -96,7 +96,7 @@
canvas->drawLine(x, y, x + SkIntToScalar(90), y + SkIntToScalar(90), paint);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
fAlpha = SkScalarRoundToInt(y);
this->inval(NULL);
return NULL;
diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp
index 81ac6ae..f21c7de 100644
--- a/samplecode/SampleLua.cpp
+++ b/samplecode/SampleLua.cpp
@@ -75,7 +75,7 @@
}
protected:
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Lua");
return true;
@@ -101,7 +101,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
lua_State* L = this->ensureLua();
lua_getglobal(L, gDrawName);
@@ -147,7 +147,7 @@
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) SK_OVERRIDE {
if (click->getType() != gLuaClickHandlerName) {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleManyRects.cpp b/samplecode/SampleManyRects.cpp
index 5182341..c563394 100644
--- a/samplecode/SampleManyRects.cpp
+++ b/samplecode/SampleManyRects.cpp
@@ -26,7 +26,7 @@
ManyRectsView() {}
protected:
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "ManyRects");
return true;
diff --git a/samplecode/SampleOvalTest.cpp b/samplecode/SampleOvalTest.cpp
index ef9c20d..b3ea88c 100644
--- a/samplecode/SampleOvalTest.cpp
+++ b/samplecode/SampleOvalTest.cpp
@@ -100,7 +100,7 @@
}
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
this->inval(NULL);
return NULL;
}
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 14aae82..550c47c 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -201,7 +201,7 @@
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 {
fShowHairline = !fShowHairline;
this->inval(NULL);
return this->INHERITED::onFindClickHandler(x, y, modi);
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 04f2cdb..a85038e 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -70,7 +70,7 @@
canvas->drawOval(oval, p);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
return new Click(this);
}
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;
diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index 691f57a..9d2f6ff 100644
--- a/samplecode/SampleRectanizer.cpp
+++ b/samplecode/SampleRectanizer.cpp
@@ -51,7 +51,7 @@
}
protected:
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Rectanizer");
return true;
@@ -77,7 +77,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
if (fCurRandRect < kNumRandRects) {
if (fCurRectanizer->addRect((*fCurRects)[fCurRandRect].fWidth,
(*fCurRects)[fCurRandRect].fHeight,
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 70105d2..c25b073 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -219,7 +219,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ 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 fbbc472..bfdfab8 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp
@@ -49,7 +49,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
make_paint(&paint, SkShader::kRepeat_TileMode);
@@ -66,13 +66,13 @@
canvas->drawPaint(paint);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
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);
}
diff --git a/samplecode/SampleRotateCircles.cpp b/samplecode/SampleRotateCircles.cpp
index 0687b06..139c23c 100644
--- a/samplecode/SampleRotateCircles.cpp
+++ b/samplecode/SampleRotateCircles.cpp
@@ -96,7 +96,7 @@
}
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 @@
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 @@
}
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 @@
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 @@
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 @@
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),
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 0e70a3e..5a358c6 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -83,7 +83,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index 603714a..e115235 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -697,7 +697,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Slides");
return true;
@@ -705,12 +705,12 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
this->init();
gProc[fIndex](canvas);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
this->init();
fIndex = (fIndex + 1) % SK_ARRAY_COUNT(gProc);
this->inval(NULL);
diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp
index 353d4cc..8522478 100644
--- a/samplecode/SampleStringArt.cpp
+++ b/samplecode/SampleStringArt.cpp
@@ -19,7 +19,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "StringArt");
return true;
@@ -27,7 +27,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkScalar angle = fAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI);
SkPoint center = SkPoint::Make(SkScalarHalf(this->width()), SkScalarHalf(this->height()));
@@ -55,7 +55,7 @@
canvas->drawPath(path, paint);
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
fAngle = x/width();
this->inval(NULL);
return NULL;
diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index ab75fb3..4f6e3cc 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -124,7 +124,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
test_huge_stroke(canvas); return;
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp
index 4652bc3..4695962 100644
--- a/samplecode/SampleSubpixelTranslate.cpp
+++ b/samplecode/SampleSubpixelTranslate.cpp
@@ -52,7 +52,7 @@
SkPoint fCurPos;
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "SubpixelTranslate");
return true;
@@ -60,7 +60,7 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
static const SkPaint::FilterLevel gLevels[] = {
SkPaint::kNone_FilterLevel,
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 82fee4a..112573e 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -115,7 +115,7 @@
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");
return true;
@@ -143,7 +143,7 @@
pts[i].set(rand->nextUScalar1() * 640, rand->nextUScalar1() * 480);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index f5c8e9d..58e1db2 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -36,7 +36,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
const char* str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
SkPaint paint;
SkScalar x = SkIntToScalar(10);
@@ -69,11 +69,11 @@
}
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
return new Click(this);
}
- virtual bool onClick(Click* click) SK_OVERRIDE {
+ 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 2ba387a..ac889c3 100644
--- a/samplecode/SampleTextOnPath.cpp
+++ b/samplecode/SampleTextOnPath.cpp
@@ -105,7 +105,7 @@
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 @@
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 @@
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);
}
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index ffe4428..9591fec 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -51,7 +51,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "unpremul");
return true;
@@ -77,14 +77,14 @@
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
SkAutoTUnref<SkShader> shader(createChecker());
paint.setShader(shader.get());
canvas->drawPaint(paint);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(24));
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 748c5a6..6dac0b5 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -77,7 +77,7 @@
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ 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) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setDither(true);
paint.setFilterLevel(SkPaint::kLow_FilterLevel);
@@ -119,11 +119,11 @@
}
}
- virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE {
return new Click(this);
}
- virtual bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) SK_OVERRIDE {
// fCurrX = click->fICurr.fX;
// fCurrY = click->fICurr.fY;
this->inval(NULL);