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/bench/PathBench.cpp b/bench/PathBench.cpp
index 6ae3152..a2da0e2 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -70,7 +70,7 @@
}
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
class TrianglePathBench : public PathBench {
@@ -90,7 +90,7 @@
path->close();
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class RectPathBench : public PathBench {
@@ -105,7 +105,7 @@
path->addRect(r);
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class RotatedRectBench : public PathBench {
@@ -134,7 +134,7 @@
paint->setAntiAlias(fAA);
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
int fDegrees;
bool fAA;
};
@@ -151,7 +151,7 @@
path->addOval(r);
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class CirclePathBench: public PathBench {
@@ -166,7 +166,7 @@
SkIntToScalar(10));
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class NonAACirclePathBench: public CirclePathBench {
@@ -183,7 +183,7 @@
}
private:
- typedef CirclePathBench INHERITED;
+ using INHERITED = CirclePathBench;
};
// Test max speedup of Analytic AA for concave paths
@@ -204,7 +204,7 @@
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
// Test max speedup of Analytic AA for convex paths
@@ -224,7 +224,7 @@
}
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class SawToothPathBench : public PathBench {
@@ -254,7 +254,7 @@
}
int complexity() override { return 1; }
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class LongCurvedPathBench : public PathBench {
@@ -275,7 +275,7 @@
}
int complexity() override { return 2; }
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class LongLinePathBench : public PathBench {
@@ -294,7 +294,7 @@
}
int complexity() override { return 2; }
private:
- typedef PathBench INHERITED;
+ using INHERITED = PathBench;
};
class RandomPathBench : public Benchmark {
@@ -395,7 +395,7 @@
int fCurrVerb;
int fCurrPoint;
SkRandom fRandom;
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
class PathCreateBench : public RandomPathBench {
@@ -425,7 +425,7 @@
private:
SkPath fPath;
- typedef RandomPathBench INHERITED;
+ using INHERITED = RandomPathBench;
};
class PathCopyBench : public RandomPathBench {
@@ -461,7 +461,7 @@
SkAutoTArray<SkPath> fPaths;
SkAutoTArray<SkPath> fCopies;
- typedef RandomPathBench INHERITED;
+ using INHERITED = RandomPathBench;
};
class PathTransformBench : public RandomPathBench {
@@ -509,7 +509,7 @@
SkMatrix fMatrix;
bool fInPlace;
- typedef RandomPathBench INHERITED;
+ using INHERITED = RandomPathBench;
};
class PathEqualityBench : public RandomPathBench {
@@ -548,7 +548,7 @@
};
SkAutoTArray<SkPath> fPaths;
SkAutoTArray<SkPath> fCopies;
- typedef RandomPathBench INHERITED;
+ using INHERITED = RandomPathBench;
};
class SkBench_AddPathTest : public RandomPathBench {
@@ -646,7 +646,7 @@
SkAutoTArray<SkPath> fPaths0;
SkAutoTArray<SkPath> fPaths1;
SkMatrix fMatrix;
- typedef RandomPathBench INHERITED;
+ using INHERITED = RandomPathBench;
};
@@ -702,7 +702,7 @@
}
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
@@ -806,7 +806,7 @@
private:
bool fZeroRad; // should 0 radius rounds rects be tested?
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
class ConservativelyContainsBench : public Benchmark {
@@ -882,7 +882,7 @@
bool fParity;
SkTDArray<SkRect> fQueryRects;
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
///////////////////////////////////////////////////////////////////////////////
@@ -914,7 +914,7 @@
}
}
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
DEF_BENCH( return new ConicBench_Chop; )
@@ -999,7 +999,7 @@
}
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
DEF_BENCH( return new ConicBench_TinyError; )
@@ -1036,7 +1036,7 @@
SkConic fConics[CONICS];
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
class ConicBench_ComputeError : public ConicBench {
@@ -1058,7 +1058,7 @@
}
private:
- typedef ConicBench INHERITED;
+ using INHERITED = ConicBench;
};
class ConicBench_asQuadTol : public ConicBench {
@@ -1079,7 +1079,7 @@
}
private:
- typedef ConicBench INHERITED;
+ using INHERITED = ConicBench;
};
class ConicBench_quadPow2 : public ConicBench {
@@ -1100,7 +1100,7 @@
}
private:
- typedef ConicBench INHERITED;
+ using INHERITED = ConicBench;
};
///////////////////////////////////////////////////////////////////////////////
@@ -1141,7 +1141,7 @@
}
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
@@ -1267,7 +1267,7 @@
}
private:
- typedef Benchmark INHERITED;
+ using INHERITED = Benchmark;
};
DEF_BENCH( return new CommonConvexBench( 16, 16, false, false); )