diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-23 02:08:50 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-23 02:08:50 +0000 |
| commit | 259210c376700da04d8746df416217d7a78ecff9 (patch) | |
| tree | f83270703e61cfc58f738f5a4fd10337efc7e1de /include | |
| parent | f50ff5c24088561cb190e19b9420089d3b07a1d8 (diff) | |
add SK_OVERRIDE
git-svn-id: http://skia.googlecode.com/svn/trunk@2738 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/effects/Sk1DPathEffect.h | 10 | ||||
| -rw-r--r-- | include/effects/Sk2DPathEffect.h | 12 | ||||
| -rw-r--r-- | include/effects/SkAvoidXfermode.h | 12 |
3 files changed, 17 insertions, 17 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 1ba824cb23..51a5a78686 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -57,7 +57,7 @@ public: SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); // override from SkPathEffect - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkPath1DPathEffect, (buffer)); @@ -67,11 +67,11 @@ protected: SkPath1DPathEffect(SkFlattenableReadBuffer& buffer); // overrides from Sk1DPathEffect - virtual SkScalar begin(SkScalar contourLength); - virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&); + virtual SkScalar begin(SkScalar contourLength) SK_OVERRIDE; + virtual SkScalar next(SkPath*, SkScalar distance, SkPathMeasure&) SK_OVERRIDE; // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& ); - virtual Factory getFactory() { return CreateProc; } + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } private: SkPath fPath; // copied from constructor diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index f27a6b384a..f0d60ca578 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -19,11 +19,11 @@ public: Sk2DPathEffect(const SkMatrix& mat); // overrides - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&); - virtual Factory getFactory(); + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; + virtual Factory getFactory() SK_OVERRIDE; protected: /** New virtual, to be overridden by subclasses. @@ -72,9 +72,9 @@ public: protected: SkPath2DPathEffect(SkFlattenableReadBuffer& buffer); - virtual void flatten(SkFlattenableWriteBuffer&); - virtual Factory getFactory(); - virtual void next(const SkPoint& loc, int u, int v, SkPath* dst); + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; + virtual Factory getFactory() SK_OVERRIDE; + virtual void next(const SkPoint&, int u, int v, SkPath* dst) SK_OVERRIDE; private: SkPath fPath; diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h index 24b4959e4f..8497265ded 100644 --- a/include/effects/SkAvoidXfermode.h +++ b/include/effects/SkAvoidXfermode.h @@ -43,17 +43,17 @@ public: // overrides from SkXfermode virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, - const SkAlpha aa[]); + const SkAlpha aa[]) SK_OVERRIDE; virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count, - const SkAlpha aa[]); + const SkAlpha aa[]) SK_OVERRIDE; virtual void xfer4444(uint16_t dst[], const SkPMColor src[], int count, - const SkAlpha aa[]); + const SkAlpha aa[]) SK_OVERRIDE; virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, - const SkAlpha aa[]); + const SkAlpha aa[]) SK_OVERRIDE; // overrides from SkFlattenable - virtual Factory getFactory(); - virtual void flatten(SkFlattenableWriteBuffer&); + virtual Factory getFactory() SK_OVERRIDE; + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkAvoidXfermode, (buffer)); |