Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7571f9e

Browse files
johnstiles-googleSkia Commit-Bot
authored andcommitted
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>
1 parent 683becc commit 7571f9e

File tree

956 files changed

+1420
-1420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

956 files changed

+1420
-1420
lines changed

bench/AAClipBench.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class AAClipBench : public Benchmark {
7878
}
7979
}
8080
private:
81-
typedef Benchmark INHERITED;
81+
using INHERITED = Benchmark;
8282
};
8383

8484
////////////////////////////////////////////////////////////////////////////////
@@ -165,7 +165,7 @@ class NestedAAClipBench : public Benchmark {
165165
}
166166

167167
private:
168-
typedef Benchmark INHERITED;
168+
using INHERITED = Benchmark;
169169
};
170170

171171
////////////////////////////////////////////////////////////////////////////////
@@ -207,7 +207,7 @@ class AAClipBuilderBench : public Benchmark {
207207
}
208208
}
209209
private:
210-
typedef Benchmark INHERITED;
210+
using INHERITED = Benchmark;
211211
};
212212

213213
////////////////////////////////////////////////////////////////////////////////
@@ -237,7 +237,7 @@ class AAClipRegionBench : public Benchmark {
237237

238238
private:
239239
SkRegion fRegion;
240-
typedef Benchmark INHERITED;
240+
using INHERITED = Benchmark;
241241
};
242242

243243
////////////////////////////////////////////////////////////////////////////////

bench/AlternatingColorPatternBench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class AlternatingColorPatternBench : public Benchmark {
160160
}
161161

162162
private:
163-
typedef Benchmark INHERITED;
163+
using INHERITED = Benchmark;
164164
};
165165

166166
DEF_BENCH(return new AlternatingColorPatternBench(kWhite_ColorPattern,

bench/AndroidCodecBench.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ class AndroidCodecBench : public Benchmark {
3535
const int fSampleSize;
3636
SkImageInfo fInfo; // Set in onDelayedSetup.
3737
SkAutoMalloc fPixelStorage; // Set in onDelayedSetup.
38-
typedef Benchmark INHERITED;
38+
using INHERITED = Benchmark;
3939
};
4040
#endif // AndroidCodecBench_DEFINED

bench/Benchmark.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Benchmark : public SkRefCnt {
103103
private:
104104
int fUnits = 1;
105105

106-
typedef SkRefCnt INHERITED;
106+
using INHERITED = SkRefCnt;
107107
};
108108

109109
typedef sk_tools::Registry<Benchmark*(*)(void*)> BenchRegistry;

bench/BezierBench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class BezierBench : public Benchmark {
9090
}
9191

9292
private:
93-
typedef Benchmark INHERITED;
93+
using INHERITED = Benchmark;
9494
};
9595

9696
DEF_BENCH( return new BezierBench(SkPaint::kButt_Cap, SkPaint::kRound_Join, 2, draw_quad); )

bench/BigPathBench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class BigPathBench : public Benchmark {
7272
}
7373

7474
private:
75-
typedef Benchmark INHERITED;
75+
using INHERITED = Benchmark;
7676
};
7777

7878
DEF_BENCH( return new BigPathBench(kLeft_Align, false); )

bench/BitmapBench.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class BitmapBench : public Benchmark {
115115
}
116116

117117
private:
118-
typedef Benchmark INHERITED;
118+
using INHERITED = Benchmark;
119119
};
120120

121121
/** Explicitly invoke some filter types to improve coverage of acceleration
@@ -202,7 +202,7 @@ class FilterBitmapBench : public BitmapBench {
202202
}
203203

204204
private:
205-
typedef BitmapBench INHERITED;
205+
using INHERITED = BitmapBench;
206206
};
207207

208208
/** Verify optimizations that test source alpha values. */
@@ -290,7 +290,7 @@ class SourceAlphaBitmapBench : public BitmapBench {
290290
}
291291

292292
private:
293-
typedef BitmapBench INHERITED;
293+
using INHERITED = BitmapBench;
294294
};
295295

296296
DEF_BENCH( return new BitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false); )

bench/BitmapRectBench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class BitmapRectBench : public Benchmark {
103103
}
104104

105105
private:
106-
typedef Benchmark INHERITED;
106+
using INHERITED = Benchmark;
107107
};
108108

109109
DEF_BENCH(return new BitmapRectBench(0xFF, kNone_SkFilterQuality, false))

bench/BitmapRegionDecoderBench.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BitmapRegionDecoderBench : public Benchmark {
4646
const SkColorType fColorType;
4747
const uint32_t fSampleSize;
4848
const SkIRect fSubset;
49-
typedef Benchmark INHERITED;
49+
using INHERITED = Benchmark;
5050
};
5151
#endif // SK_ENABLE_ANDROID_UTILS
5252
#endif // BitmapRegionDecoderBench_DEFINED

bench/BlendmodeBench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class XfermodeBench : public Benchmark {
6666
SkString fName;
6767
bool fAA;
6868

69-
typedef Benchmark INHERITED;
69+
using INHERITED = Benchmark;
7070
};
7171

7272
//////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)