From 3f82f8ff07a9d16a7c047129658c1bbedfdb5436 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 15 Nov 2012 18:45:31 -0800
Subject: [PATCH] Rename hb_buffer_guess_properties() to
 hb_buffer_guess_segment_properties()

---
 src/hb-buffer-private.hh | 2 +-
 src/hb-buffer.cc         | 6 +++---
 src/hb-buffer.h          | 2 +-
 src/hb-fallback-shape.cc | 2 +-
 src/hb-ot-shape.cc       | 2 +-
 src/hb-shape.cc          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 80ca7ae6c..13cf4bb0e 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -114,7 +114,7 @@ struct hb_buffer_t {
   HB_INTERNAL void reverse_range (unsigned int start, unsigned int end);
   HB_INTERNAL void reverse (void);
   HB_INTERNAL void reverse_clusters (void);
-  HB_INTERNAL void guess_properties (void);
+  HB_INTERNAL void guess_segment_properties (void);
 
   HB_INTERNAL void swap_buffers (void);
   HB_INTERNAL void remove_output (void);
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 5d38b3c23..0f5a97f15 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -491,7 +491,7 @@ hb_buffer_t::merge_out_clusters (unsigned int start,
 }
 
 void
-hb_buffer_t::guess_properties (void)
+hb_buffer_t::guess_segment_properties (void)
 {
   if (unlikely (!len)) return;
   assert (content_type == HB_BUFFER_CONTENT_TYPE_UNICODE);
@@ -886,9 +886,9 @@ hb_buffer_reverse_clusters (hb_buffer_t *buffer)
 }
 
 void
-hb_buffer_guess_properties (hb_buffer_t *buffer)
+hb_buffer_guess_segment_properties (hb_buffer_t *buffer)
 {
-  buffer->guess_properties ();
+  buffer->guess_segment_properties ();
 }
 
 template <typename T>
diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index 255f005bf..48ec4a527 100644
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -168,7 +168,7 @@ hb_buffer_get_segment_properties (hb_buffer_t *buffer,
 				  hb_segment_properties_t *props);
 
 void
-hb_buffer_guess_properties (hb_buffer_t *buffer);
+hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
 
 
 typedef enum {
diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc
index 3f9024feb..989596ee5 100644
--- a/src/hb-fallback-shape.cc
+++ b/src/hb-fallback-shape.cc
@@ -98,7 +98,7 @@ _hb_fallback_shape (hb_shape_plan_t    *shape_plan,
   hb_codepoint_t space;
   font->get_glyph (' ', 0, &space);
 
-  buffer->guess_properties ();
+  buffer->guess_segment_properties ();
   buffer->clear_positions ();
 
   unsigned int count = buffer->len;
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 7ef35c041..450d60941 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -610,7 +610,7 @@ hb_ot_shape_glyphs_closure (hb_font_t          *font,
 {
   hb_ot_shape_plan_t plan;
 
-  buffer->guess_properties ();
+  buffer->guess_segment_properties ();
 
   const char *shapers[] = {"ot", NULL};
   hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props,
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 7dfe0492b..389ce3e34 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -255,7 +255,7 @@ hb_shape_full (hb_font_t          *font,
 
   assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE);
 
-  buffer->guess_properties ();
+  buffer->guess_segment_properties ();
 
   hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, features, num_features, shaper_list);
   hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features);