rename the following methods:

tqparent parent
tqmask mask

7 files changed, 25 insertions, 25 deletions

diff --git a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
index 808c5f6..d60b6d3 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
+++ b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
@@ -383,7 +383,7 @@ Changes in 1.1.0 (24 Feb 98)
 Changes in 1.0.9 (17 Feb 1998)
 - added gzputs and gzgets functions
 - do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transtqparent mode (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
 - do not assume that vsprintf returns the number of bytes written (Jens Krinke)
 - replace EXPORT with ZEXPORT to avoid conflict with other programs
 - added compress2 in zconf.h, zlib.def, zlib.dnt
@@ -729,7 +729,7 @@ Changes in 0.61 (12 April 95)
 Changes in 0.6 (11 April 95)
 - added minigzip.c
 - added gzdopen to reopen a file descriptor as gzFile
-- added transtqparent reading of non-gziped files in gzread.
+- added transparent reading of non-gziped files in gzread.
 - fixed bug in gzread (don't read crc as data)
 - fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
 - don't allocate big arrays in the stack (for MSDOS)
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
index 87d2da1..c7f75a3 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
@@ -873,7 +873,7 @@ local uInt longest_match(s, cur_match)
      * we prevent matches with the string of window index 0.
      */
     Posf *prev = s->prev;
-    uInt wtqmask = s->w_mask;
+    uInt wmask = s->w_mask;
 
 #ifdef UNALIGNED_OK
     /* Compare two bytes at a time. Note: this is not always beneficial.
@@ -988,7 +988,7 @@ local uInt longest_match(s, cur_match)
             scan_end   = scan[best_len];
 #endif
         }
-    } while ((cur_match = prev[cur_match & wtqmask]) > limit
+    } while ((cur_match = prev[cur_match & wmask]) > limit
              && --chain_length != 0);
 
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/gzio.c b/tqtinterface/qt4/src/3rdparty/zlib/gzio.c
index 4b56f31..03a4cc6 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/gzio.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/gzio.c
@@ -63,7 +63,7 @@ typedef struct gz_stream {
     uLong    crc;     /* crc32 of uncompressed data */
     char     *msg;    /* error message */
     char     *path;   /* path name for debugging only */
-    int      transtqparent; /* 1 if input file is not a .gz file */
+    int      transparent; /* 1 if input file is not a .gz file */
     char     mode;    /* 'w' or 'r' */
     z_off_t  start;   /* start of compressed data in file (header skipped) */
     z_off_t  in;      /* bytes into deflate or inflate */
@@ -122,7 +122,7 @@ local gzFile gz_open (path, mode, fd)
     s->back = EOF;
     s->crc = crc32(0L, Z_NULL, 0);
     s->msg = NULL;
-    s->transtqparent = 0;
+    s->transparent = 0;
 
     s->path = (char*)ALLOC(strlen(path)+1);
     if (s->path == NULL) {
@@ -278,7 +278,7 @@ local int get_byte(s)
 
 /* ===========================================================================
       Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transtqparent if the gzip magic header is not present; set s->err
+    mode to transparent if the gzip magic header is not present; set s->err
     to Z_DATA_ERROR if the magic header is present but the rest of the header
     is incorrect.
     IN assertion: the stream s has already been created sucessfully;
@@ -305,7 +305,7 @@ local void check_header(s)
         s->stream.avail_in += len;
         s->stream.next_in = s->inbuf;
         if (s->stream.avail_in < 2) {
-            s->transtqparent = s->stream.avail_in;
+            s->transparent = s->stream.avail_in;
             return;
         }
     }
@@ -313,7 +313,7 @@ local void check_header(s)
     /* Peek ahead to check the gzip magic header */
     if (s->stream.next_in[0] != gz_magic[0] ||
         s->stream.next_in[1] != gz_magic[1]) {
-        s->transtqparent = 1;
+        s->transparent = 1;
         return;
     }
     s->stream.avail_in -= 2;
@@ -423,7 +423,7 @@ int TQ_ZEXPORT gzread (file, buf, len)
 
     while (s->stream.avail_out != 0) {
 
-        if (s->transtqparent) {
+        if (s->transparent) {
             /* Copy first the lookahead bytes: */
             uInt n = s->stream.avail_in;
             if (n > s->stream.avail_out) n = s->stream.avail_out;
@@ -811,7 +811,7 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
     }
     if (offset < 0) return -1L;
 
-    if (s->transtqparent) {
+    if (s->transparent) {
         /* map to fseek */
         s->back = EOF;
         s->stream.avail_in = 0;
@@ -867,7 +867,7 @@ int ZEXPORT gzrewind (file)
     s->stream.avail_in = 0;
     s->stream.next_in = s->inbuf;
     s->crc = crc32(0L, Z_NULL, 0);
-    if (!s->transtqparent) (void)inflateReset(&s->stream);
+    if (!s->transparent) (void)inflateReset(&s->stream);
     s->in = 0;
     s->out = 0;
     return fseek(s->file, s->start, SEEK_SET);
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/infback.c b/tqtinterface/qt4/src/3rdparty/zlib/infback.c
index 8b2f431..262f97c 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/infback.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/infback.c
@@ -253,7 +253,7 @@ void FAR *out_desc;
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
     code this;                  /* current decoding table entry */
-    code last;                  /* tqparent table entry */
+    code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
     static const unsigned short order[19] = /* permutation of code lengths */
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inffast.c b/tqtinterface/qt4/src/3rdparty/zlib/inffast.c
index 8f0930a..8c02a17 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/inffast.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/inffast.c
@@ -82,8 +82,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     unsigned bits;              /* local strm->bits */
     code const FAR *lcode;      /* local strm->lencode */
     code const FAR *dcode;      /* local strm->distcode */
-    unsigned ltqmask;             /* tqmask for first level of length codes */
-    unsigned dtqmask;             /* tqmask for first level of distance codes */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
     code this;                  /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
@@ -106,8 +106,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     bits = state->bits;
     lcode = state->lencode;
     dcode = state->distcode;
-    ltqmask = (1U << state->lenbits) - 1;
-    dtqmask = (1U << state->distbits) - 1;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
 
     /* decode literals and length/distances until end-of-block or not enough
        input data or output space */
@@ -118,7 +118,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             hold += (unsigned long)(PUP(in)) << bits;
             bits += 8;
         }
-        this = lcode[hold & ltqmask];
+        this = lcode[hold & lmask];
       dolen:
         op = (unsigned)(this.bits);
         hold >>= op;
@@ -149,7 +149,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 hold += (unsigned long)(PUP(in)) << bits;
                 bits += 8;
             }
-            this = dcode[hold & dtqmask];
+            this = dcode[hold & dmask];
           dodist:
             op = (unsigned)(this.bits);
             hold >>= op;
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inflate.c b/tqtinterface/qt4/src/3rdparty/zlib/inflate.c
index 09a5e1e..c6d3826 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/inflate.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/inflate.c
@@ -546,7 +546,7 @@ int flush;
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
     code this;                  /* current decoding table entry */
-    code last;                  /* tqparent table entry */
+    code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
 #ifdef GUNZIP
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
index 0eb643c..509461d 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
@@ -49,7 +49,7 @@ unsigned short FAR *work;
     unsigned incr;              /* for incrementing code, index */
     unsigned fill;              /* index for replicating entries */
     unsigned low;               /* low bits for current root entry */
-    unsigned tqmask;              /* tqmask for low root bits */
+    unsigned mask;              /* mask for low root bits */
     code this;                  /* table entry for duplication */
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
@@ -206,7 +206,7 @@ unsigned short FAR *work;
     drop = 0;                   /* current bits to drop from code for index */
     low = (unsigned)(-1);       /* trigger new sub-table when len > root */
     used = 1U << root;          /* use root table entries */
-    tqmask = used - 1;            /* tqmask for comparing low */
+    mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
     if (type == LENS && used >= ENOUGH - MAXD)
@@ -256,7 +256,7 @@ unsigned short FAR *work;
         }
 
         /* create new sub-table if needed */
-        if (len > root && (huff & tqmask) != low) {
+        if (len > root && (huff & mask) != low) {
             /* if first time, transition to sub-tables */
             if (drop == 0)
                 drop = root;
@@ -280,7 +280,7 @@ unsigned short FAR *work;
                 return 1;
 
             /* point entry in root table to sub-table */
-            low = huff & tqmask;
+            low = huff & mask;
             (*table)[low].op = (unsigned char)curr;
             (*table)[low].bits = (unsigned char)root;
             (*table)[low].val = (unsigned short)(next - *table);
@@ -299,7 +299,7 @@ unsigned short FAR *work;
     this.val = (unsigned short)0;
     while (huff != 0) {
         /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & tqmask) != low) {
+        if (drop != 0 && (huff & mask) != low) {
             drop = 0;
             len = root;
             next = *table;