rename the following methods:

tqparent parent
tqmask mask

1 files changed, 10 insertions, 10 deletions

diff --git a/tqtinterface/qt4/src/3rdparty/libpng/png.h b/tqtinterface/qt4/src/3rdparty/libpng/png.h
index 76fef59..a7e1a4a 100644
--- a/tqtinterface/qt4/src/3rdparty/libpng/png.h
+++ b/tqtinterface/qt4/src/3rdparty/libpng/png.h
@@ -600,7 +600,7 @@ typedef struct png_info_struct
    png_uint_32 rowbytes;    /* bytes needed to hold an untransformed row */
    png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
    png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
-   png_uint_16 num_trans;   /* number of transtqparent palette color (tRNS) */
+   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
    png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
    png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
    /* The following three should have been named *_method not *_type */
@@ -671,13 +671,13 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
     * other image types that don't need a full alpha channel.  There are
     * "num_trans" transparency values for a paletted image, stored in the
     * same order as the palette colors, starting from index 0.  Values
-    * for the data are in the range [0, 255], ranging from fully transtqparent
+    * for the data are in the range [0, 255], ranging from fully transparent
     * to fully opaque, respectively.  For non-paletted images, there is a
-    * single color specified that should be treated as fully transtqparent.
+    * single color specified that should be treated as fully transparent.
     * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
     */
-   png_bytep trans; /* transtqparent values for paletted image */
-   png_color_16 trans_values; /* transtqparent color for non-palette image */
+   png_bytep trans; /* transparent values for paletted image */
+   png_color_16 trans_values; /* transparent color for non-palette image */
 #endif
 
 #if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
@@ -1867,7 +1867,7 @@ extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
 /* Reassign responsibility for freeing existing data, whether allocated
  * by libpng or by the application */
 extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int freer, png_uint_32 tqmask));
+   png_infop info_ptr, int freer, png_uint_32 mask));
 #endif
 /* assignments for png_data_freer */
 #define PNG_DESTROY_WILL_FREE_DATA 1
@@ -2276,7 +2276,7 @@ PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
    If you need to turn it off for a chunk that your application has freed,
    you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */
 extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int tqmask));
+   png_infop info_ptr, int mask));
 
 #if defined(PNG_INFO_IMAGE_SUPPORTED)
 /* The "params" pointer is currently not used and is for future expansion. */
@@ -2384,11 +2384,11 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
 
 #if !defined(PNG_1_0_X)
 /* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_mmx_flagtqmask)
+extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
    PNGARG((int flag_select, int *compilerID));
 
 /* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_asm_flagtqmask)
+extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
    PNGARG((int flag_select));
 
 /* pngget.c */
@@ -2950,7 +2950,7 @@ PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
 
 /* combine a row of data, dealing with alpha, etc. if requested */
 PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
-   int tqmask));
+   int mask));
 
 #if defined(PNG_READ_INTERLACING_SUPPORTED)
 /* expand an interlaced row */