From 9468e4699833b6f6376503d2724fa4a8abcc8ab2 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 11 Aug 2021 16:46:04 -0600
Subject: [PATCH] [util] Rename main_font_text back to main_font_text_t

---
 util/hb-ot-shape-closure.cc | 2 +-
 util/hb-shape.cc            | 2 +-
 util/hb-subset.cc           | 2 +-
 util/hb-view.cc             | 2 +-
 util/main-font-text.hh      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/hb-ot-shape-closure.cc b/util/hb-ot-shape-closure.cc
index 9686d1d3a..90f29d989 100644
--- a/util/hb-ot-shape-closure.cc
+++ b/util/hb-ot-shape-closure.cc
@@ -114,5 +114,5 @@ struct shape_closure_consumer_t
 int
 main (int argc, char **argv)
 {
-  return main_font_text<shape_closure_consumer_t, font_options_t, text_options_t> () (argc, argv);
+  return main_font_text_t<shape_closure_consumer_t, font_options_t, text_options_t> () (argc, argv);
 }
diff --git a/util/hb-shape.cc b/util/hb-shape.cc
index 0209426ba..62ed23346 100644
--- a/util/hb-shape.cc
+++ b/util/hb-shape.cc
@@ -162,6 +162,6 @@ struct output_buffer_t : output_options_t
 int
 main (int argc, char **argv)
 {
-  using main_t = main_font_text<shape_consumer_t<output_buffer_t>, font_options_t, text_options_t>;
+  using main_t = main_font_text_t<shape_consumer_t<output_buffer_t>, font_options_t, text_options_t>;
   return batch_main<main_t> (argc, argv);
 }
diff --git a/util/hb-subset.cc b/util/hb-subset.cc
index b1a9c0d69..f9ecca173 100644
--- a/util/hb-subset.cc
+++ b/util/hb-subset.cc
@@ -129,6 +129,6 @@ struct subset_consumer_t : subset_options_t, output_options_t
 int
 main (int argc, char **argv)
 {
-  using main_t = main_font_text<subset_consumer_t, face_options_t, text_options_t>;
+  using main_t = main_font_text_t<subset_consumer_t, face_options_t, text_options_t>;
   return batch_main<main_t, true> (argc, argv);
 }
diff --git a/util/hb-view.cc b/util/hb-view.cc
index 3a9ecff47..7ecaa3709 100644
--- a/util/hb-view.cc
+++ b/util/hb-view.cc
@@ -37,5 +37,5 @@ const unsigned SUBPIXEL_BITS = 6;
 int
 main (int argc, char **argv)
 {
-  return main_font_text<shape_consumer_t<view_cairo_t>, font_options_t, text_options_t> () (argc, argv);
+  return main_font_text_t<shape_consumer_t<view_cairo_t>, font_options_t, text_options_t> () (argc, argv);
 }
diff --git a/util/main-font-text.hh b/util/main-font-text.hh
index 9d7e2094e..6f1827606 100644
--- a/util/main-font-text.hh
+++ b/util/main-font-text.hh
@@ -32,7 +32,7 @@
 /* main() body for utilities taking font and processing text.*/
 
 template <typename consumer_t, typename font_options_t, typename text_options_t>
-struct main_font_text : font_options_t, text_options_t, consumer_t
+struct main_font_text_t : font_options_t, text_options_t, consumer_t
 {
   void add_options (struct option_parser_t *parser)
   {