Automated update from Qt3

14 files changed, 43 insertions, 43 deletions

diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES
index 65d047b18..d151a41c7 100644
--- a/src/3rdparty/libpng/CHANGES
+++ b/src/3rdparty/libpng/CHANGES
@@ -167,7 +167,7 @@ version 0.96 [May, 1997]
   fixed DOS medium model support (Tim Wegner)
   fixed png_check_keyword() for case with error in static string text
   added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
-  added typecasts to tquiet compiler errors
+  added typecasts to quiet compiler errors
   added more debugging info
 version 0.97 [January, 1998]
   removed PNG_USE_OWN_CRC capability
@@ -935,7 +935,7 @@ version 1.0.11 [April 27, 2001]
 version 1.0.12beta1 [May 14, 2001]
   Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot)
   Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h
-  Added some never-to-be-executed code in pnggccrd.c to tquiet compiler warnings.
+  Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings.
   Eliminated the png_error about apps using png_read|write_init().  Instead,
     libpng will reallocate the png_struct and info_struct if they are too small.
     This retains future binary compatibility for old applications written for
@@ -1055,7 +1055,7 @@ version 1.2.2beta5 [March 26, 2002]
   Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
 version 1.2.2beta6 [March 31, 2002]
 version 1.0.13beta1 [March 31, 2002]
-  Prevent png_zalloc() from trying to memset memory that it failed to actquire.
+  Prevent png_zalloc() from trying to memset memory that it failed to acquire.
   Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
   Ensure that the right function (user or default) is used to free the
     png_struct after an error in png_create_read_struct_2().
diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL
index d407c9e43..1d6dfc5f0 100644
--- a/src/3rdparty/libpng/INSTALL
+++ b/src/3rdparty/libpng/INSTALL
@@ -132,7 +132,7 @@ Then read pngconf.h to see if you want to make any configuration
 changes.
 
 Then just run "make test" which will create the libpng library in
-this directory and run a tquick test that reads the "pngtest.png"
+this directory and run a quick test that reads the "pngtest.png"
 file and writes a "pngout.png" file that should be identical to it.
 Look for "9782 zero samples" in the output of the test.  For more
 confidence, you can run another test by typing "pngtest pngnow.png"
diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3
index 249fc0959..b54b54799 100644
--- a/src/3rdparty/libpng/libpng.3
+++ b/src/3rdparty/libpng/libpng.3
@@ -957,7 +957,7 @@ pointers to error handling functions, and a pointer to a data struct for
 use by the error functions, if necessary (the pointer and functions can
 be NULL if the default error handlers are to be used).  See the section
 on Changes to Libpng below regarding the old initialization functions.
-The structure allocation functions tquietly return NULL if they fail to
+The structure allocation functions quietly return NULL if they fail to
 create the structure, so your application should check for that.
 
     png_structp png_ptr = png_create_read_struct
@@ -1470,7 +1470,7 @@ rowbytes, as some of the transformations could increase the space
 needed to hold a row (expand, filler, gray_to_rgb, etc.).
 See png_read_update_info(), below.
 
-A tquick word about text_ptr and num_text.  PNG stores comments in
+A quick word about text_ptr and num_text.  PNG stores comments in
 keyword/text pairs, one pair per chunk, with no limit on the number
 of text chunks, and a 2^31 byte limit on their size.  While there are
 suggested keywords, there is no requirement to restrict the use to these
@@ -2626,7 +2626,7 @@ structure (that is, the value of "i", which is the order in which
 the chunk was either read from the input file or defined with
 png_set_unknown_chunks).
 
-A tquick word about text and num_text.  text is an array of png_text
+A quick word about text and num_text.  text is an array of png_text
 structures.  num_text is the number of valid structures in the array.
 Each png_text structure holds a language code, a keyword, a text value,
 and a compression type.
@@ -3200,7 +3200,7 @@ library code itself needs to know about interactions between your
 chunk and existing `intrinsic' chunks.
 
 If you need to write a new intrinsic chunk, first read the PNG
-specification. Actquire a first level of
+specification. Acquire a first level of
 understanding of how it works.  Pay particular attention to the
 sections that describe chunk names, and look at how other chunks were
 designed, so you can do things similarly.  Second, check out the
diff --git a/src/3rdparty/libpng/libpng.txt b/src/3rdparty/libpng/libpng.txt
index c0892e508..689b56481 100644
--- a/src/3rdparty/libpng/libpng.txt
+++ b/src/3rdparty/libpng/libpng.txt
@@ -166,7 +166,7 @@ pointers to error handling functions, and a pointer to a data struct for
 use by the error functions, if necessary (the pointer and functions can
 be NULL if the default error handlers are to be used).  See the section
 on Changes to Libpng below regarding the old initialization functions.
-The structure allocation functions tquietly return NULL if they fail to
+The structure allocation functions quietly return NULL if they fail to
 create the structure, so your application should check for that.
 
     png_structp png_ptr = png_create_read_struct
@@ -679,7 +679,7 @@ rowbytes, as some of the transformations could increase the space
 needed to hold a row (expand, filler, gray_to_rgb, etc.).
 See png_read_update_info(), below.
 
-A tquick word about text_ptr and num_text.  PNG stores comments in
+A quick word about text_ptr and num_text.  PNG stores comments in
 keyword/text pairs, one pair per chunk, with no limit on the number
 of text chunks, and a 2^31 byte limit on their size.  While there are
 suggested keywords, there is no requirement to restrict the use to these
@@ -1835,7 +1835,7 @@ structure (that is, the value of "i", which is the order in which
 the chunk was either read from the input file or defined with
 png_set_unknown_chunks).
 
-A tquick word about text and num_text.  text is an array of png_text
+A quick word about text and num_text.  text is an array of png_text
 structures.  num_text is the number of valid structures in the array.
 Each png_text structure holds a language code, a keyword, a text value,
 and a compression type.
@@ -2409,7 +2409,7 @@ library code itself needs to know about interactions between your
 chunk and existing `intrinsic' chunks.
 
 If you need to write a new intrinsic chunk, first read the PNG
-specification. Actquire a first level of
+specification. Acquire a first level of
 understanding of how it works.  Pay particular attention to the
 sections that describe chunk names, and look at how other chunks were
 designed, so you can do things similarly.  Second, check out the
diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h
index 98390e263..55f9b650d 100644
--- a/src/3rdparty/libpng/png.h
+++ b/src/3rdparty/libpng/png.h
@@ -746,7 +746,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
     * The integer range [0, 2^bit_depth - 1] maps to the floating-point
     * range given by [pcal_X0, pcal_X1], and are further transformed by a
     * (possibly non-linear) transformation function given by "pcal_type"
-    * and "pcal_params" into "pcal_units".  Please see the PNG_ETQUATION_
+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
     * defines below, and the PNG-Group's PNG extensions document for a
     * complete description of the transformations and how they should be
     * implemented, and for a description of the ASCII parameter strings.
@@ -757,7 +757,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
    png_int_32 pcal_X1;      /* maximum value */
    png_charp pcal_units;    /* Latin-1 string giving physical units */
    png_charpp pcal_params;  /* ASCII strings containing parameter values */
-   png_byte pcal_type;      /* equation type (see PNG_ETQUATION_ below) */
+   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
    png_byte pcal_nparams;   /* number of parameters given in pcal_params */
 #endif
 
@@ -875,11 +875,11 @@ typedef png_info FAR * FAR * png_infopp;
 #define PNG_OFFSET_LAST           2 /* Not a valid value */
 
 /* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_ETQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_ETQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_ETQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_ETQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_ETQUATION_LAST         4 /* Not a valid value */
+#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST         4 /* Not a valid value */
 
 /* These are for the sCAL chunk.  These values should NOT be changed. */
 #define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
@@ -1505,7 +1505,7 @@ extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
 #define PNG_BACKGROUND_GAMMA_UNKNOWN 0
 #define PNG_BACKGROUND_GAMMA_SCREEN  1
 #define PNG_BACKGROUND_GAMMA_FILE    2
-#define PNG_BACKGROUND_GAMMA_UNITQUE  3
+#define PNG_BACKGROUND_GAMMA_UNIQUE  3
 #endif
 
 #if defined(PNG_READ_16_TO_8_SUPPORTED)
@@ -1619,7 +1619,7 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
 #define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
 #define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
 #define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* tquiet/use data      tquiet/use data    */
+#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
 #define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
 
 /* These functions give the user control over the scan-line filtering in
diff --git a/src/3rdparty/libpng/pngpread.c b/src/3rdparty/libpng/pngpread.c
index 5da819b4a..36701f627 100644
--- a/src/3rdparty/libpng/pngpread.c
+++ b/src/3rdparty/libpng/pngpread.c
@@ -1031,7 +1031,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place tEXt");
-         /* to tquiet some compiler warnings */
+         /* to quiet some compiler warnings */
          if(info_ptr == NULL) return;
       }
 
@@ -1127,7 +1127,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place zTXt");
-         /* to tquiet some compiler warnings */
+         /* to quiet some compiler warnings */
          if(info_ptr == NULL) return;
       }
 
@@ -1319,7 +1319,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
    if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
       {
          png_error(png_ptr, "Out of place iTXt");
-         /* to tquiet some compiler warnings */
+         /* to quiet some compiler warnings */
          if(info_ptr == NULL) return;
       }
 
@@ -1446,7 +1446,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
 #endif
          png_chunk_error(png_ptr, "unknown critical chunk");
 
-      /* to tquiet compiler warnings about unused info_ptr */
+      /* to quiet compiler warnings about unused info_ptr */
       if (info_ptr == NULL)
          return;
    }
diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c
index 269a6be0d..80d0ba042 100644
--- a/src/3rdparty/libpng/pngread.c
+++ b/src/3rdparty/libpng/pngread.c
@@ -1412,7 +1412,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
    png_read_end(png_ptr, info_ptr);
 
    if(transforms == 0 || params == NULL)
-      /* tquiet compiler warnings */ return;
+      /* quiet compiler warnings */ return;
 
 }
 #endif
diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c
index 4f002c806..a0a3994d7 100644
--- a/src/3rdparty/libpng/pngrtran.c
+++ b/src/3rdparty/libpng/pngrtran.c
@@ -30,7 +30,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
          png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
          png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
          break;
-      case PNG_CRC_QUIET_USE:                             /* tquiet/use data */
+      case PNG_CRC_QUIET_USE:                             /* quiet/use data */
          png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
          png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
                            PNG_FLAG_CRC_CRITICAL_IGNORE;
@@ -52,7 +52,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
          png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
          png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
          break;
-      case PNG_CRC_QUIET_USE:                            /* tquiet/use data */
+      case PNG_CRC_QUIET_USE:                            /* quiet/use data */
          png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
          png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
                            PNG_FLAG_CRC_ANCILLARY_NOWARN;
@@ -281,7 +281,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette,
       }
       else
       {
-         /* This is much harder to do simply (and tquickly).  Perhaps
+         /* This is much harder to do simply (and quickly).  Perhaps
             we need to go through a median cut routine, but those
             don't always behave themselves with only a few colors
             as input.  So we will just find the closest two colors,
@@ -813,7 +813,7 @@ png_init_read_transformations(png_structp png_ptr)
                      g = 1.0 / (png_ptr->gamma);
                      gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
                      break;
-                  case PNG_BACKGROUND_GAMMA_UNITQUE:
+                  case PNG_BACKGROUND_GAMMA_UNIQUE:
                      g = 1.0 / (png_ptr->background_gamma);
                      gs = 1.0 / (png_ptr->background_gamma *
                                  png_ptr->screen_gamma);
@@ -897,7 +897,7 @@ png_init_read_transformations(png_structp png_ptr)
                   g = 1.0 / (png_ptr->gamma);
                   gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
                   break;
-               case PNG_BACKGROUND_GAMMA_UNITQUE:
+               case PNG_BACKGROUND_GAMMA_UNIQUE:
                   g = 1.0 / (png_ptr->background_gamma);
                   gs = 1.0 / (png_ptr->background_gamma *
                      png_ptr->screen_gamma);
diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c
index 798abd2fc..13e085232 100644
--- a/src/3rdparty/libpng/pngrutil.c
+++ b/src/3rdparty/libpng/pngrutil.c
@@ -551,7 +551,7 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    {
       png_error(png_ptr, "No image in file");
 
-      info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */
+      info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
    }
 
    png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
@@ -1624,16 +1624,16 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    png_debug(3, "Checking pCAL equation type and number of parameters\n");
    /* Check that we have the right number of parameters for known
       equation types. */
-   if ((type == PNG_ETQUATION_LINEAR && nparams != 2) ||
-       (type == PNG_ETQUATION_BASE_E && nparams != 3) ||
-       (type == PNG_ETQUATION_ARBITRARY && nparams != 3) ||
-       (type == PNG_ETQUATION_HYPERBOLIC && nparams != 4))
+   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
    {
       png_warning(png_ptr, "Invalid pCAL parameters for equation type");
       png_free(png_ptr, purpose);
       return;
    }
-   else if (type >= PNG_ETQUATION_LAST)
+   else if (type >= PNG_EQUATION_LAST)
    {
       png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
    }
@@ -2211,7 +2211,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    png_crc_finish(png_ptr, skip);
 
 #if !defined(PNG_READ_USER_CHUNKS_SUPPORTED)
-   info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */
+   info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
 #endif
 }
 
diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c
index 1e98090ab..10c9ea406 100644
--- a/src/3rdparty/libpng/pngwrite.c
+++ b/src/3rdparty/libpng/pngwrite.c
@@ -1444,7 +1444,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
    png_write_end(png_ptr, info_ptr);
 
    if(transforms == 0 || params == NULL)
-      /* tquiet compiler warnings */ return;
+      /* quiet compiler warnings */ return;
 }
 #endif
 #endif /* PNG_WRITE_SUPPORTED */
diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c
index d640179a7..43d26c2a6 100644
--- a/src/3rdparty/libpng/pngwutil.c
+++ b/src/3rdparty/libpng/pngwutil.c
@@ -1470,7 +1470,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
    int i;
 
    png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams);
-   if (type >= PNG_ETQUATION_LAST)
+   if (type >= PNG_EQUATION_LAST)
       png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
 
    purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
diff --git a/src/3rdparty/libpng/scripts/makefile.amiga b/src/3rdparty/libpng/scripts/makefile.amiga
index 9e352507a..79cb42499 100644
--- a/src/3rdparty/libpng/scripts/makefile.amiga
+++ b/src/3rdparty/libpng/scripts/makefile.amiga
@@ -22,7 +22,7 @@ LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib
 # linker
 LN= slink
 # file deletion command
-RM= delete tquiet
+RM= delete quiet
 # library (.lib) file creation command
 AR= oml
 # make directory command
diff --git a/src/3rdparty/libpng/scripts/pngdef.pas b/src/3rdparty/libpng/scripts/pngdef.pas
index ecfb8feb3..6e2068317 100644
--- a/src/3rdparty/libpng/scripts/pngdef.pas
+++ b/src/3rdparty/libpng/scripts/pngdef.pas
@@ -210,7 +210,7 @@ const
   PNG_CRC_ERROR_QUIT   = 1;  // error/quit          error/quit
   PNG_CRC_WARN_DISCARD = 2;  // (INVALID)           warn/discard data
   PNG_CRC_WARN_USE     = 3;  // warn/use data       warn/use data
-  PNG_CRC_QUIET_USE    = 4;  // tquiet/use data      tquiet/use data
+  PNG_CRC_QUIET_USE    = 4;  // quiet/use data      quiet/use data
   PNG_CRC_NO_CHANGE    = 5;  // use current value   use current value
 
 // Flags for png_set_filter() to say which filters to use.  The flags
diff --git a/src/3rdparty/libpng/scripts/smakefile.ppc b/src/3rdparty/libpng/scripts/smakefile.ppc
index 5406dbbbc..e5c027841 100644
--- a/src/3rdparty/libpng/scripts/smakefile.ppc
+++ b/src/3rdparty/libpng/scripts/smakefile.ppc
@@ -13,7 +13,7 @@ RANLIB   = ppc-amigaos-ranlib
 LDFLAGS  = -r -o
 LDLIBS   =  ../zlib/libzip.a LIB:scppc.a
 LN       = ppc-amigaos-ld
-RM       = delete tquiet
+RM       = delete quiet
 MKDIR    = makedir
 
 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \