diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2002-11-08 19:00:52 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2002-11-08 19:00:52 +0000 |
| commit | 23c23546a22a785be7eca60f4bc59f7723456ffe (patch) | |
| tree | 17eb05c1468d6ade4fc77feb36547d026a6de5af /pango/pango-layout.h | |
| parent | 1b16a7e3e014d4b4f4e6f30521a572689fa75df5 (diff) | |
| download | pango-23c23546a22a785be7eca60f4bc59f7723456ffe.tar.gz | |
Trivial s/foo/foo_/ fixes to make pango.h includable with -Wshadow
Fri Nov 8 20:02:09 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* docs/tmpl/coverage-maps.sgml:
* docs/tmpl/glyphs.sgml:
* docs/tmpl/layout.sgml:
* docs/tmpl/x-fonts.sgml:
* pango/mapping.c:
* pango/pango-coverage.c:
* pango/pango-coverage.h:
* pango/pango-glyph.h:
* pango/pango-layout.c:
* pango/pango-layout.h:
* pango/pangox.h:
Trivial s/foo/foo_/ fixes to make pango.h includable with -Wshadow
(#91680).
Diffstat (limited to 'pango/pango-layout.h')
| -rw-r--r-- | pango/pango-layout.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pango/pango-layout.h b/pango/pango-layout.h index 6b679b6b..e840de79 100644 --- a/pango/pango-layout.h +++ b/pango/pango-layout.h @@ -134,10 +134,10 @@ void pango_layout_get_log_attrs (PangoLayout *layout, gint *n_attrs); void pango_layout_index_to_pos (PangoLayout *layout, - int index, + int index_, PangoRectangle *pos); void pango_layout_get_cursor_pos (PangoLayout *layout, - int index, + int index_, PangoRectangle *strong_pos, PangoRectangle *weak_pos); void pango_layout_move_cursor_visually (PangoLayout *layout, @@ -150,7 +150,7 @@ void pango_layout_move_cursor_visually (PangoLayout *layout, gboolean pango_layout_xy_to_index (PangoLayout *layout, int x, int y, - int *index, + int *index_, int *trailing); void pango_layout_get_extents (PangoLayout *layout, PangoRectangle *ink_rect, @@ -174,10 +174,10 @@ void pango_layout_line_ref (PangoLayoutLine *line); void pango_layout_line_unref (PangoLayoutLine *line); gboolean pango_layout_line_x_to_index (PangoLayoutLine *line, int x_pos, - int *index, + int *index_, int *trailing); void pango_layout_line_index_to_x (PangoLayoutLine *line, - int index, + int index_, gboolean trailing, int *x_pos); void pango_layout_line_get_x_ranges (PangoLayoutLine *line, @@ -222,8 +222,8 @@ void pango_layout_iter_get_line_extents (PangoLayoutIter *iter, * assign between-line spacing to the nearest line) */ void pango_layout_iter_get_line_yrange (PangoLayoutIter *iter, - int *y0, - int *y1); + int *y0_, + int *y1_); void pango_layout_iter_get_layout_extents (PangoLayoutIter *iter, PangoRectangle *ink_rect, PangoRectangle *logical_rect); |