Rename

diff --git a/src/hb-array.hh b/src/hb-array.hh
index a778351..af4233b 100644 (file)
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -36,7 +36,7 @@ struct hb_sorted_array_t;
 template <typename Type>
 struct hb_array_t
 {
-  typedef Type item_type_t;
+  typedef Type item_t;
   enum { item_size = hb_static_size (Type) };
 
   /*

diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index 8956f45..4c6d5e3 100644 (file)
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -352,7 +352,7 @@ static inline Type& operator + (Base &base, OffsetTo<Type, OffsetType, has_null>
 template <typename Type>
 struct UnsizedArrayOf
 {
-  typedef Type item_type_t;
+  typedef Type item_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (UnsizedArrayOf, Type);
@@ -508,7 +508,7 @@ struct SortedUnsizedArrayOf : UnsizedArrayOf<Type>
 template <typename Type, typename LenType=HBUINT16>
 struct ArrayOf
 {
-  typedef Type item_type_t;
+  typedef Type item_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType);

diff --git a/src/hb-vector.hh b/src/hb-vector.hh
index b4175c5..4e962d2 100644 (file)
--- a/src/hb-vector.hh
+++ b/src/hb-vector.hh
@@ -34,7 +34,7 @@
 template <typename Type, unsigned int PreallocedCount=8>
 struct hb_vector_t
 {
-  typedef Type item_type_t;
+  typedef Type item_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_COPY_ASSIGN_TEMPLATE2 (hb_vector_t, Type, PreallocedCount);