From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002 --- samplecode/SampleSlides.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'samplecode/SampleSlides.cpp') diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index b626cdb08e..6899fc111e 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -697,7 +697,7 @@ public: protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Slides"); return true; @@ -705,12 +705,12 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { this->init(); gProc[fIndex](canvas); } - SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) override { this->init(); fIndex = (fIndex + 1) % SK_ARRAY_COUNT(gProc); this->inval(NULL); -- cgit v1.2.3