Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / skia / 7571f9e4902490c7a316c715e838d5042e2689f1^! / . / samplecode
commit7571f9e4902490c7a316c715e838d5042e2689f1[log] [tgz]
authorJohn Stiles <johnstiles@google.com>Wed Sep 02 22:42:33 2020 -0400
committerSkia Commit-Bot <skia-commit-bot@chromium.org>Thu Sep 03 03:41:26 2020 +0000
tree7f8cbc10729c8e433c77a4128954d46bbed73dfa
parent683beccf6776bb1f53f2ecb772f878f7dcfa8100 [diff]
Replace 'typedef xxxxx INHERITED' with 'using INHERITED = xxxx;'.

Mechanically updated via Xcode "Replace Regular Expression":

  typedef (.*) INHERITED;
    -->
  using INHERITED = $1;

The ClangTidy approach generated an even larger CL which would have
required a significant amount of hand-tweaking to be usable.

Change-Id: I671dc9d9efdf6d60151325c8d4d13fad7e10a15b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314999
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp
index b0d526d..d659914 100644
--- a/samplecode/PerlinPatch.cpp
+++ b/samplecode/PerlinPatch.cpp

@@ -203,7 +203,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE( return new PerlinPatchView(); )

diff --git a/samplecode/Sample2PtRadial.cpp b/samplecode/Sample2PtRadial.cpp
index 4aadacb..f404d14 100644
--- a/samplecode/Sample2PtRadial.cpp
+++ b/samplecode/Sample2PtRadial.cpp

@@ -32,7 +32,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index be51eab..2aeb685 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp

@@ -347,7 +347,7 @@
     }
 
 private:
-    typedef Sample3DView INHERITED;
+    using INHERITED = Sample3DView;
 };
 
 class SampleBump3D : public SampleCubeBase {

diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
index 584589f..492174b 100644
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp

@@ -1695,7 +1695,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 static struct KeyCommand {

diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp
index 834a1e5..d22eb7a 100644
--- a/samplecode/SampleAARects.cpp
+++ b/samplecode/SampleAARects.cpp

@@ -170,7 +170,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleAndroidShadows.cpp b/samplecode/SampleAndroidShadows.cpp
index d5f264c..50c626e 100644
--- a/samplecode/SampleAndroidShadows.cpp
+++ b/samplecode/SampleAndroidShadows.cpp

@@ -327,7 +327,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleAtlas.cpp b/samplecode/SampleAtlas.cpp
index 85d267c..d34c52f4 100644
--- a/samplecode/SampleAtlas.cpp
+++ b/samplecode/SampleAtlas.cpp

@@ -198,7 +198,7 @@
     }
 
 private:
-    typedef SkDrawable INHERITED;
+    using INHERITED = SkDrawable;
 };
 
 class DrawAtlasView : public Sample {
@@ -239,7 +239,7 @@
 #endif
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleAudio.cpp b/samplecode/SampleAudio.cpp
index efd45d6..c09a816 100644
--- a/samplecode/SampleAudio.cpp
+++ b/samplecode/SampleAudio.cpp

@@ -90,6 +90,6 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new AudioView; )

diff --git a/samplecode/SampleBackdropBounds.cpp b/samplecode/SampleBackdropBounds.cpp
index 67ac714..35b9447 100644
--- a/samplecode/SampleBackdropBounds.cpp
+++ b/samplecode/SampleBackdropBounds.cpp

@@ -145,7 +145,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE(return new BackdropBoundsSample();)

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 758c076..b9885ef 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp

@@ -111,7 +111,7 @@
 
     CCPRGeometryView* fView;
 
-    typedef GrDrawOp INHERITED;
+    using INHERITED = GrDrawOp;
 };
 
 class CCPRGeometryView::VisualizeCoverageCountFP : public GrFragmentProcessor {

diff --git a/samplecode/SampleCusp.cpp b/samplecode/SampleCusp.cpp
index 28b1233..dd33002 100644
--- a/samplecode/SampleCusp.cpp
+++ b/samplecode/SampleCusp.cpp

@@ -175,7 +175,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE( return new CuspView(); )

diff --git a/samplecode/SampleDegenerateQuads.cpp b/samplecode/SampleDegenerateQuads.cpp
index b905410..ddf23e7 100644
--- a/samplecode/SampleDegenerateQuads.cpp
+++ b/samplecode/SampleDegenerateQuads.cpp

@@ -448,7 +448,7 @@
         *domain = {vertices[52], vertices[53], vertices[54], vertices[55]};
     }
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 class DegenerateQuadSample::Click : public Sample::Click {

diff --git a/samplecode/SampleDegenerateTwoPtRadials.cpp b/samplecode/SampleDegenerateTwoPtRadials.cpp
index f26403e..f0c74be 100644
--- a/samplecode/SampleDegenerateTwoPtRadials.cpp
+++ b/samplecode/SampleDegenerateTwoPtRadials.cpp

@@ -73,7 +73,7 @@
 
 private:
     SkScalar           fTime;
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp
index 91bb523..5a49ded 100644
--- a/samplecode/SampleEffects.cpp
+++ b/samplecode/SampleEffects.cpp

@@ -98,7 +98,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp
index d36dc29..0c49a85 100644
--- a/samplecode/SampleEmboss.cpp
+++ b/samplecode/SampleEmboss.cpp

@@ -51,7 +51,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 7f1ef61..72dac8f 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp

@@ -499,7 +499,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleFillType.cpp b/samplecode/SampleFillType.cpp
index 3aa4cb2..7330549 100644
--- a/samplecode/SampleFillType.cpp
+++ b/samplecode/SampleFillType.cpp

@@ -77,7 +77,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp
index f18a1a6..56d0721 100644
--- a/samplecode/SampleFilterQuality.cpp
+++ b/samplecode/SampleFilterQuality.cpp

@@ -284,7 +284,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleFlutterAnimate.cpp b/samplecode/SampleFlutterAnimate.cpp
index 67506d2..514d7f6 100644
--- a/samplecode/SampleFlutterAnimate.cpp
+++ b/samplecode/SampleFlutterAnimate.cpp

@@ -90,7 +90,7 @@
     static constexpr int kNumChars = 40;
     AnimatedChar fChars[kNumChars];
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleFontCache.cpp b/samplecode/SampleFontCache.cpp
index 9f39e9c..72662f2 100644
--- a/samplecode/SampleFontCache.cpp
+++ b/samplecode/SampleFontCache.cpp

@@ -124,7 +124,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleGlyphTransform.cpp b/samplecode/SampleGlyphTransform.cpp
index 2260a1a..cd7191b 100644
--- a/samplecode/SampleGlyphTransform.cpp
+++ b/samplecode/SampleGlyphTransform.cpp

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2018 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
@@ -75,7 +75,7 @@
     SkScalar fScale;
     SkScalar fRotate;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleGradients.cpp b/samplecode/SampleGradients.cpp
index 9eb4e71..e3ade38 100644
--- a/samplecode/SampleGradients.cpp
+++ b/samplecode/SampleGradients.cpp

@@ -155,7 +155,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index bec4a7d..940cd2f 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp

@@ -168,7 +168,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleHairCurves.cpp b/samplecode/SampleHairCurves.cpp
index 73a6aee..cdb8ed8 100644
--- a/samplecode/SampleHairCurves.cpp
+++ b/samplecode/SampleHairCurves.cpp

@@ -114,7 +114,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index 5df28f5..359f388 100644
--- a/samplecode/SampleHairModes.cpp
+++ b/samplecode/SampleHairModes.cpp

@@ -108,7 +108,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index a43ac44..e188f14 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp

@@ -223,7 +223,7 @@
 
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp
index 5b337d2..0f0b17c 100644
--- a/samplecode/SampleIdentityScale.cpp
+++ b/samplecode/SampleIdentityScale.cpp

@@ -65,7 +65,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleImageFilterDAG.cpp b/samplecode/SampleImageFilterDAG.cpp
index 915777c..1ec986e 100644
--- a/samplecode/SampleImageFilterDAG.cpp
+++ b/samplecode/SampleImageFilterDAG.cpp

@@ -509,7 +509,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE(return new ImageFilterDAGSample();)

diff --git a/samplecode/SampleLCD.cpp b/samplecode/SampleLCD.cpp
index 3c71415..0fd46a1 100644
--- a/samplecode/SampleLCD.cpp
+++ b/samplecode/SampleLCD.cpp

@@ -49,7 +49,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp
index 7e00267..845e4a1 100644
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp

@@ -58,7 +58,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 420caad..f7c1818 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp

@@ -163,7 +163,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new LayersView; )
 
@@ -226,6 +226,6 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new BackdropView; )

diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp
index ee36774..3502473 100644
--- a/samplecode/SampleLua.cpp
+++ b/samplecode/SampleLua.cpp

@@ -153,7 +153,7 @@
 private:
     SkLua* fLua;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleManyRects.cpp b/samplecode/SampleManyRects.cpp
index cfd66c9..7278eed 100644
--- a/samplecode/SampleManyRects.cpp
+++ b/samplecode/SampleManyRects.cpp

@@ -59,7 +59,7 @@
 
 private:
     SkRandom fRandom;
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleMegaStroke.cpp b/samplecode/SampleMegaStroke.cpp
index 33fa431..15579d9 100644
--- a/samplecode/SampleMegaStroke.cpp
+++ b/samplecode/SampleMegaStroke.cpp

@@ -76,7 +76,7 @@
     SkRect      fClip;
     int         fAngle;
     int         fPlusMinus;
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleMixer.cpp b/samplecode/SampleMixer.cpp
index 8a10d72..aa6d831 100644
--- a/samplecode/SampleMixer.cpp
+++ b/samplecode/SampleMixer.cpp

@@ -85,6 +85,6 @@
 private:
     SkIRect fRect;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new MixerView; )

diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index 421f99b..fb4caa4 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp

@@ -314,7 +314,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 }  // namespace
 DEF_SAMPLE( return new PatchView(); )
@@ -415,7 +415,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 }  // namespace
 DEF_SAMPLE( return new PseudoInkView(); )
@@ -502,7 +502,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 }  // namespace
 DEF_SAMPLE( return new ManyStrokesView(); )

diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 888590e..a778183 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp

@@ -195,7 +195,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new PathView; )
 
@@ -294,7 +294,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new ArcToView; )
 
@@ -421,7 +421,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new FatStroke; )
 
@@ -529,7 +529,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new CubicCurve; )
 
@@ -716,7 +716,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new CubicCurve2; )
 

diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index daf5bb3..c004e9f 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp

@@ -60,7 +60,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new PathClipView; )
 
@@ -300,7 +300,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE( return new EdgeClipView; )

diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp
index ccdc541..5ed3241 100644
--- a/samplecode/SamplePathEffects.cpp
+++ b/samplecode/SamplePathEffects.cpp

@@ -137,7 +137,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SamplePathOverstroke.cpp b/samplecode/SamplePathOverstroke.cpp
index a01562b..9ebf1d4 100644
--- a/samplecode/SamplePathOverstroke.cpp
+++ b/samplecode/SamplePathOverstroke.cpp

@@ -191,7 +191,7 @@
     }
 
    private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp
index 942a722..04b2b71 100644
--- a/samplecode/SamplePolyToPoly.cpp
+++ b/samplecode/SamplePolyToPoly.cpp

@@ -147,7 +147,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index a4dce80..3652bea 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp

@@ -799,7 +799,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index 67f36f9..2b81079 100644
--- a/samplecode/SampleRectanizer.cpp
+++ b/samplecode/SampleRectanizer.cpp

@@ -180,7 +180,7 @@
         fCurRandRect = 0;
     }
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 160c1a3..30ed3df 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp

@@ -338,7 +338,7 @@
 private:
     SkIRect    fBase, fRect;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp
index 3b7dea0..c12a274 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp

@@ -57,7 +57,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleSG.cpp b/samplecode/SampleSG.cpp
index 5842730..1fa8994 100644
--- a/samplecode/SampleSG.cpp
+++ b/samplecode/SampleSG.cpp

@@ -101,7 +101,7 @@
 
 private:
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleSVGFile.cpp b/samplecode/SampleSVGFile.cpp
index 9fb62ed..6069fae 100644
--- a/samplecode/SampleSVGFile.cpp
+++ b/samplecode/SampleSVGFile.cpp

@@ -66,7 +66,7 @@
     SkString        fPath;
     SkString        fLabel;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 } // anonymous namespace

diff --git a/samplecode/SampleShadowColor.cpp b/samplecode/SampleShadowColor.cpp
index 71208aa..7313bda 100644
--- a/samplecode/SampleShadowColor.cpp
+++ b/samplecode/SampleShadowColor.cpp

@@ -221,7 +221,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleShadowReference.cpp b/samplecode/SampleShadowReference.cpp
index db8e9db..76439fb 100644
--- a/samplecode/SampleShadowReference.cpp
+++ b/samplecode/SampleShadowReference.cpp

@@ -191,7 +191,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleShadowUtils.cpp b/samplecode/SampleShadowUtils.cpp
index 5fffd63..2571c03 100644
--- a/samplecode/SampleShadowUtils.cpp
+++ b/samplecode/SampleShadowUtils.cpp

@@ -247,7 +247,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp
index 8fdc9eb..25853b5 100644
--- a/samplecode/SampleShip.cpp
+++ b/samplecode/SampleShip.cpp

@@ -135,7 +135,7 @@
     SkRSXform   fXform[kGrid*kGrid+1];
     SkRect      fTex[kGrid*kGrid+1];
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleSimpleStroker.cpp b/samplecode/SampleSimpleStroker.cpp
index c5c476e..999b084 100644
--- a/samplecode/SampleSimpleStroker.cpp
+++ b/samplecode/SampleSimpleStroker.cpp

@@ -476,7 +476,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE(return new SimpleStroker;)

diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index 109608c..48979a4 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp

@@ -449,7 +449,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp
index 2447ccb..9f2b3b1 100644
--- a/samplecode/SampleStringArt.cpp
+++ b/samplecode/SampleStringArt.cpp

@@ -57,7 +57,7 @@
 private:
 
     SkScalar fAngle;
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index b22ba8d..dace79a 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp

@@ -201,7 +201,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleStrokeRect.cpp b/samplecode/SampleStrokeRect.cpp
index f172c47..d4cc4ae 100644
--- a/samplecode/SampleStrokeRect.cpp
+++ b/samplecode/SampleStrokeRect.cpp

@@ -56,7 +56,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp
index 3d8385f..a3649e5 100644
--- a/samplecode/SampleSubpixelTranslate.cpp
+++ b/samplecode/SampleSubpixelTranslate.cpp

@@ -103,7 +103,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index 72bc272..23cdf30 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp

@@ -110,7 +110,7 @@
 
 private:
     std::unique_ptr<SkShaper> fShaper;
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 DEF_SAMPLE( return new TextBoxView([](){ return SkShaper::Make(); }, "default"); );
@@ -184,6 +184,6 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new SampleShaper; );

diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index 602d39b..10fd89b 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp

@@ -55,7 +55,7 @@
     SkScalar fRadius;
     SkTDArray<SkPoint>* fPts;
 
-    typedef Sk2DPathEffect INHERITED;
+    using INHERITED = Sk2DPathEffect;
 };
 
 // Register this path effect as deserializable before main().
@@ -86,7 +86,7 @@
 private:
     SK_FLATTENABLE_HOOKS(InverseFillPE)
 
-    typedef SkPathEffect INHERITED;
+    using INHERITED = SkPathEffect;
 };
 
 sk_sp<SkFlattenable> InverseFillPE::CreateProc(SkReadBuffer& buffer) {
@@ -162,7 +162,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleThinAA.cpp b/samplecode/SampleThinAA.cpp
index 5608acb..0a5a25a 100644
--- a/samplecode/SampleThinAA.cpp
+++ b/samplecode/SampleThinAA.cpp

@@ -64,7 +64,7 @@
 private:
     RectRenderer() {}
 
-    typedef ShapeRenderer INHERITED;
+    using INHERITED = ShapeRenderer;
 };
 
 class PathRenderer : public ShapeRenderer {
@@ -149,7 +149,7 @@
             : fDepth(depth)
             , fHairline(hairline) {}
 
-    typedef ShapeRenderer INHERITED;
+    using INHERITED = ShapeRenderer;
 };
 
 class OffscreenShapeRenderer : public ShapeRenderer {
@@ -237,7 +237,7 @@
             , fRenderer(std::move(renderer))
             , fSupersampleFactor(supersample) { }
 
-    typedef ShapeRenderer INHERITED;
+    using INHERITED = ShapeRenderer;
 };
 
 class ThinAASample : public Sample {
@@ -535,7 +535,7 @@
         canvas->translate(0.f, 8.f * ShapeRenderer::kTileHeight + 20.f);
     }
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 9c606bd..02239c9 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp

@@ -158,7 +158,7 @@
         this->decodeCurrFile();
     }
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 25afd41..db7a53d 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp

@@ -204,7 +204,7 @@
 
     Rec fRecs[3];
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleWritePixels.cpp b/samplecode/SampleWritePixels.cpp
index d014e86..eeed376 100644
--- a/samplecode/SampleWritePixels.cpp
+++ b/samplecode/SampleWritePixels.cpp

@@ -50,7 +50,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index 7053f2b..c005bd7 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp

@@ -193,7 +193,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new XferDemo; )
 
@@ -303,6 +303,6 @@
     SkRect                  fDomain;
     SkImage::CubicResampler fCubic;
 
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 DEF_SAMPLE( return new CubicResamplerDemo; )

diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index b565b79..bdbc4a0 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp

@@ -141,7 +141,7 @@
     }
 
 private:
-    typedef Sample INHERITED;
+    using INHERITED = Sample;
 };
 
 //////////////////////////////////////////////////////////////////////////////