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 | |
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')
-rw-r--r-- | pango/mapping.c | 4 | ||||
-rw-r--r-- | pango/pango-coverage.c | 6 | ||||
-rw-r--r-- | pango/pango-coverage.h | 4 | ||||
-rw-r--r-- | pango/pango-glyph.h | 4 | ||||
-rw-r--r-- | pango/pango-layout.c | 20 | ||||
-rw-r--r-- | pango/pango-layout.h | 14 | ||||
-rw-r--r-- | pango/pangox.h | 2 |
7 files changed, 27 insertions, 27 deletions
diff --git a/pango/mapping.c b/pango/mapping.c index a5e6a872..46e45ac8 100644 --- a/pango/mapping.c +++ b/pango/mapping.c @@ -36,7 +36,7 @@ * @text: the text for the run * @length: the number of bytes (not characters) in @text. * @analysis: the analysis information return from pango_itemize() - * @index: the byte index within @text + * @index_: the byte index within @text * @trailing: whether we should compute the result for the beginning * or end of the character. * @x_pos: location to store result @@ -160,7 +160,7 @@ pango_glyph_string_index_to_x (PangoGlyphString *glyphs, * @length: the number of bytes (not characters) in text. * @analysis: the analysis information return from pango_itemize() * @x_pos: the x offset (in thousands of a device unit) - * @index: location to store calculated byte index within @text + * @index_: location to store calculated byte index within @text * @trailing: location to store a integer indicating where * whether the user clicked on the leading or trailing * edge of the character. diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index 10b37f96..52a7c958 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -156,7 +156,7 @@ pango_coverage_unref (PangoCoverage *coverage) /** * pango_coverage_get: * @coverage: a #PangoCoverage - * @index: the index to check + * @index_: the index to check * * Determine whether a particular index is covered by @coverage * @@ -192,8 +192,8 @@ pango_coverage_get (PangoCoverage *coverage, /** * pango_coverage_set: * @coverage: a #PangoCoverage - * @index: the index to modify - * @level: the new level for @index + * @index_: the index to modify + * @level: the new level for @index_ * * Modify a particular index within @coverage **/ diff --git a/pango/pango-coverage.h b/pango/pango-coverage.h index 0ebe4fb6..e1e8d133 100644 --- a/pango/pango-coverage.h +++ b/pango/pango-coverage.h @@ -40,9 +40,9 @@ PangoCoverage * pango_coverage_ref (PangoCoverage *coverage); void pango_coverage_unref (PangoCoverage *coverage); PangoCoverage * pango_coverage_copy (PangoCoverage *coverage); PangoCoverageLevel pango_coverage_get (PangoCoverage *coverage, - int index); + int index_); void pango_coverage_set (PangoCoverage *coverage, - int index, + int index_, PangoCoverageLevel level); void pango_coverage_max (PangoCoverage *coverage, PangoCoverage *other); diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h index 16db8f8a..a3d0772b 100644 --- a/pango/pango-glyph.h +++ b/pango/pango-glyph.h @@ -109,7 +109,7 @@ void pango_glyph_string_index_to_x (PangoGlyphString *glyphs, char *text, int length, PangoAnalysis *analysis, - int index, + int index_, gboolean trailing, int *x_pos); void pango_glyph_string_x_to_index (PangoGlyphString *glyphs, @@ -117,7 +117,7 @@ void pango_glyph_string_x_to_index (PangoGlyphString *glyphs, int length, PangoAnalysis *analysis, int x_pos, - int *index, + int *index_, int *trailing); /* Turn a string of characters into a string of glyphs diff --git a/pango/pango-layout.c b/pango/pango-layout.c index aec4ed70..f38465d5 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -955,7 +955,7 @@ pango_layout_get_line (PangoLayout *layout, /** * pango_layout_line_index_to_x: * @line: a #PangoLayoutLine - * @index: byte offset of a grapheme within the layout + * @index_: byte offset of a grapheme within the layout * @trailing: an integer indicating the edge of the grapheme to retrieve * the position of. If 0, the trailing edge of the grapheme, * if > 0, the leading of the grapheme. @@ -1119,7 +1119,7 @@ pango_layout_index_to_line_and_extents (PangoLayout *layout, /** * pango_layout_index_to_line_x: * @layout: a #PangoLayout - * @index: the byte index of a grapheme within the layout. + * @index_: the byte index of a grapheme within the layout. * @trailing: an integer indicating the edge of the grapheme to retrieve the * position of. If 0, the trailing edge of the grapheme, if > 0, * the leading of the grapheme. @@ -1128,7 +1128,7 @@ pango_layout_index_to_line_and_extents (PangoLayout *layout, * @x_pos: location to store resulting position within line * (in thousandths of a device unit) * - * Converts from byte @index within the @layout to line and X position. + * Converts from byte @index_ within the @layout to line and X position. * (X position is measured from the left edge of the line) */ void @@ -1351,7 +1351,7 @@ pango_layout_move_cursor_visually (PangoLayout *layout, * from the left edge of the layout. * @y: the Y offset (in thousandths of a device unit) * from the top edge of the layout - * @index: location to store calculated byte index + * @index_: location to store calculated byte index * @trailing: location to store a integer indicating where * in the grapheme the user clicked. It will either * be zero, or the number of characters in the @@ -1452,7 +1452,7 @@ pango_layout_xy_to_index (PangoLayout *layout, /** * pango_layout_index_to_pos: * @layout: a #PangoLayout - * @index: byte index within @layout + * @index_: byte index within @layout * @pos: rectangle in which to store the position of the grapheme * * Convert from an index within a PangoLayout to the onscreen position @@ -1677,7 +1677,7 @@ pango_layout_line_get_char_direction (PangoLayoutLine *layout_line, /** * pango_layout_get_cursor_pos: * @layout: a #PangoLayout - * @index: the byte index of the cursor + * @index_: the byte index of the cursor * @strong_pos: location to store the strong cursor position (may be %NULL) * @weak_pos: location to store the weak cursor position (may be %NULL) * @@ -3026,7 +3026,7 @@ pango_layout_line_unref (PangoLayoutLine *line) * @line: a #PangoLayoutLine * @x_pos: the x offset (in thousands of a device unit) * from the left edge of the line. - * @index: location to store calculated byte offset for + * @index_: location to store calculated byte offset for * the grapheme in which the user clicked. * @trailing: location to store a integer indicating where * in the grapheme the user clicked. It will either @@ -3035,7 +3035,7 @@ pango_layout_line_unref (PangoLayoutLine *line) * * Convert from x offset to the byte index of the corresponding * character within the text of the layout. If @x_pos is outside the line, - * the start or end of the line will be stored at @index. + * the start or end of the line will be stored at @index_. * * Returns: %FALSE if @x_pos was outside the line, %TRUE if inside **/ @@ -4536,8 +4536,8 @@ pango_layout_iter_get_line_extents (PangoLayoutIter *iter, /** * pango_layout_iter_get_line_yrange: * @iter: a #PangoLayoutIter - * @y0: start of line - * @y1: end of line + * @y0_: start of line + * @y1_: end of line * * Divides the vertical space in the #PangoLayout being iterated over * between the lines in the layout, and returns the space belonging to 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); diff --git a/pango/pangox.h b/pango/pangox.h index 20759d80..9f2a6833 100644 --- a/pango/pangox.h +++ b/pango/pangox.h @@ -68,7 +68,7 @@ void pango_x_render_layout (Display *display, */ typedef guint16 PangoXSubfont; -#define PANGO_X_MAKE_GLYPH(subfont,index) ((subfont)<<16 | (index)) +#define PANGO_X_MAKE_GLYPH(subfont,index_) ((subfont)<<16 | (index_)) #define PANGO_X_GLYPH_SUBFONT(glyph) ((glyph)>>16) #define PANGO_X_GLYPH_INDEX(glyph) ((glyph) & 0xffff) |