diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2013-01-07 16:46:37 -0600 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-07 16:46:37 -0600 |
commit | 1172dc736280566426eb6dade1a886b2a0ca9aa4 (patch) | |
tree | 0762a38a80e270e4f0259f80852d469f8ff5ef5a | |
parent | 7b912c1936c3e8a7df27a30782ca127d0a83822d (diff) |
Rename hb_buffer_clear() to hb_buffer_clear_contents()
The previous name was clashing with harfbuzz.old. There are systems
that need to link both...
Clash-free now again.
-rw-r--r-- | src/hb-buffer.cc | 2 | ||||
-rw-r--r-- | src/hb-buffer.h | 2 | ||||
-rw-r--r-- | test/api/test-buffer.c | 2 | ||||
-rw-r--r-- | util/options.hh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc index 4b644e40..c7860e9b 100644 --- a/src/hb-buffer.cc +++ b/src/hb-buffer.cc @@ -790,7 +790,7 @@ hb_buffer_reset (hb_buffer_t *buffer) } void -hb_buffer_clear (hb_buffer_t *buffer) +hb_buffer_clear_contents (hb_buffer_t *buffer) { buffer->clear (); } diff --git a/src/hb-buffer.h b/src/hb-buffer.h index 48ec4a52..5386e360 100644 --- a/src/hb-buffer.h +++ b/src/hb-buffer.h @@ -193,7 +193,7 @@ hb_buffer_reset (hb_buffer_t *buffer); /* Like reset, but does NOT clear unicode_funcs. */ void -hb_buffer_clear (hb_buffer_t *buffer); +hb_buffer_clear_contents (hb_buffer_t *buffer); /* Returns false if allocation failed */ hb_bool_t diff --git a/test/api/test-buffer.c b/test/api/test-buffer.c index f826f2e7..82fdaae7 100644 --- a/test/api/test-buffer.c +++ b/test/api/test-buffer.c @@ -135,7 +135,7 @@ test_buffer_properties (fixture_t *fixture, gconstpointer user_data) /* test clear clears all properties but unicode_funcs */ - hb_buffer_clear (b); + hb_buffer_clear_contents (b); g_assert (hb_buffer_get_unicode_funcs (b) == ufuncs); g_assert (hb_buffer_get_direction (b) == HB_DIRECTION_INVALID); diff --git a/util/options.hh b/util/options.hh index 02af7583..ad925b24 100644 --- a/util/options.hh +++ b/util/options.hh @@ -175,7 +175,7 @@ struct shape_options_t : option_group_t void populate_buffer (hb_buffer_t *buffer, const char *text, int text_len, const char *text_before, const char *text_after) { - hb_buffer_clear (buffer); + hb_buffer_clear_contents (buffer); if (text_before) { unsigned int len = strlen (text_before); hb_buffer_add_utf8 (buffer, text_before, len, len, 0); |