Cleanup: More override fixes - another round.

samplecode/SampleRegion.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 201 matching lines @@
     }
 
     void build_rgn(SkRegion* rgn, SkRegion::Op op) {
         build_base_rgn(rgn);
         rgn->op(fRect, op);
     }
 
 
 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;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     static void drawstr(SkCanvas* canvas, const char text[], const SkPoint& loc,
                         bool hilite) {
         SkPaint paint;
@@ skipping 81 matching lines @@
         SkPaint paint;
 
         paint.setStyle(SkPaint::kFill_Style);
         paint.setColor((color & ~(0xFF << 24)) | (0x44 << 24));
         canvas->drawPath(path, paint);
         paint.setColor(color);
         paint.setStyle(SkPaint::kStroke_Style);
         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;
         }
         if (false) { // avoid bit rot, suppress warning
             test_text(canvas);
             return;
         }
 #ifdef SK_DEBUG
         if (true) {
@@ skipping 57 matching lines @@
             canvas->translate(SkIntToScalar(200), 0);
         }
     }
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
                                               unsigned modi) SK_OVERRIDE {
         return fRect.contains(SkScalarRoundToInt(x),
                               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);
         return true;
     }
 
 private:
     SkIRect    fBase, fRect;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new RegionView; }
 static SkViewRegister reg(MyFactory);