diff options
Diffstat (limited to 'pango/break.c')
| -rw-r--r-- | pango/break.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/pango/break.c b/pango/break.c index b31eca13..3d3494f7 100644 --- a/pango/break.c +++ b/pango/break.c @@ -24,7 +24,9 @@ #include "pango-break.h" #include "pango-script-private.h" #include "pango-emoji-private.h" -#include "pango-attributes-private.h" +#include "pango-attributes.h" +#include "pango-attr-list-private.h" +#include "pango-attr-iterator-private.h" #include "pango-break-table.h" #include "pango-impl-utils.h" #include <string.h> @@ -1792,7 +1794,7 @@ handle_allow_breaks (const char *text, PangoAttrIterator iter; gboolean tailored = FALSE; - _pango_attr_list_get_iterator (attrs, &iter); + pango_attr_list_init_iterator (attrs, &iter); do { @@ -1828,7 +1830,7 @@ handle_allow_breaks (const char *text, } while (pango_attr_iterator_next (&iter)); - _pango_attr_iterator_destroy (&iter); + pango_attr_iterator_clear (&iter); return tailored; } @@ -1845,7 +1847,7 @@ handle_words (const char *text, PangoAttrIterator iter; gboolean tailored = FALSE; - _pango_attr_list_get_iterator (attrs, &iter); + pango_attr_list_init_iterator (attrs, &iter); do { @@ -1934,7 +1936,7 @@ handle_words (const char *text, } while (pango_attr_iterator_next (&iter)); - _pango_attr_iterator_destroy (&iter); + pango_attr_iterator_clear (&iter); return tailored; } @@ -1950,7 +1952,7 @@ handle_sentences (const char *text, PangoAttrIterator iter; gboolean tailored = FALSE; - _pango_attr_list_get_iterator (attrs, &iter); + pango_attr_list_init_iterator (attrs, &iter); do { @@ -2022,7 +2024,7 @@ handle_sentences (const char *text, } while (pango_attr_iterator_next (&iter)); - _pango_attr_iterator_destroy (&iter); + pango_attr_iterator_clear (&iter); return tailored; } @@ -2038,7 +2040,7 @@ handle_hyphens (const char *text, PangoAttrIterator iter; gboolean tailored = FALSE; - _pango_attr_list_get_iterator (attrs, &iter); + pango_attr_list_init_iterator (attrs, &iter); do { const PangoAttribute *attr = pango_attr_iterator_get (&iter, PANGO_ATTR_INSERT_HYPHENS); @@ -2071,7 +2073,7 @@ handle_hyphens (const char *text, } } while (pango_attr_iterator_next (&iter)); - _pango_attr_iterator_destroy (&iter); + pango_attr_iterator_clear (&iter); return tailored; } @@ -2091,10 +2093,10 @@ break_attrs (const char *text, GSList *l; gboolean tailored = FALSE; - _pango_attr_list_init (&allow_breaks); - _pango_attr_list_init (&words); - _pango_attr_list_init (&sentences); - _pango_attr_list_init (&hyphens); + pango_attr_list_init (&allow_breaks); + pango_attr_list_init (&words); + pango_attr_list_init (&sentences); + pango_attr_list_init (&hyphens); for (l = attributes; l; l = l->next) { @@ -2122,10 +2124,10 @@ break_attrs (const char *text, tailored |= handle_allow_breaks (text, length, &allow_breaks, offset, log_attrs, log_attrs_len); - _pango_attr_list_destroy (&allow_breaks); - _pango_attr_list_destroy (&words); - _pango_attr_list_destroy (&sentences); - _pango_attr_list_destroy (&hyphens); + pango_attr_list_destroy (&allow_breaks); + pango_attr_list_destroy (&words); + pango_attr_list_destroy (&sentences); + pango_attr_list_destroy (&hyphens); return tailored; } |