| Index: samplecode/SampleTextOnPath.cpp
|
| diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp
|
| index 95ae5480161d51e4cce7619bf56e46a1fd0fbb6d..7ea4694761af64c418ab63dba09335feda152924 100644
|
| --- a/samplecode/SampleTextOnPath.cpp
|
| +++ b/samplecode/SampleTextOnPath.cpp
|
| @@ -94,7 +94,7 @@ public:
|
| SkScalar fHOffset;
|
|
|
| protected:
|
| - void onOnceBeforeDraw() SK_OVERRIDE {
|
| + void onOnceBeforeDraw() override {
|
| SkRect r;
|
| r.set(SkIntToScalar(100), SkIntToScalar(100),
|
| SkIntToScalar(300), SkIntToScalar(300));
|
| @@ -105,7 +105,7 @@ protected:
|
| }
|
|
|
| // overrides from SkEventSink
|
| - bool onQuery(SkEvent* evt) SK_OVERRIDE {
|
| + bool onQuery(SkEvent* evt) override {
|
| if (SampleCode::TitleQ(*evt)) {
|
| SampleCode::TitleR(evt, "Text On Path");
|
| return true;
|
| @@ -113,7 +113,7 @@ protected:
|
| return this->INHERITED::onQuery(evt);
|
| }
|
|
|
| - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDrawContent(SkCanvas* canvas) override {
|
| SkPaint paint;
|
| paint.setAntiAlias(true);
|
| paint.setTextSize(SkIntToScalar(48));
|
| @@ -151,13 +151,13 @@ protected:
|
| this->inval(NULL);
|
| }
|
|
|
| - SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
|
| + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
|
| fHints += 1;
|
| this->inval(NULL);
|
| return this->INHERITED::onFindClickHandler(x, y, modi);
|
| }
|
|
|
| - bool onClick(Click* click) SK_OVERRIDE {
|
| + bool onClick(Click* click) override {
|
| return this->INHERITED::onClick(click);
|
| }
|
|
|
|
|