Update from latest conversion script

12 files changed, 43 insertions, 43 deletions

diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h
index 1880743d4..0284f1cb3 100644
--- a/src/3rdparty/libmng/libmng.h
+++ b/src/3rdparty/libmng/libmng.h
@@ -779,7 +779,7 @@ MNG_EXT mng_retcode MNG_DECL mng_set_doprogressive   (mng_handle        hHandle,
     system-defined default.
 
     TO RECAP: for sRGB systems (Windows, Linux) no action retquired!
-              for non-sRGB systems (SGI, Mac, Next) ACTION RETQUIRED!
+              for non-sRGB systems (SGI, Mac, Next) ACTION REQUIRED!
 
     Please visit http://www.srgb.com, http://www.color.org and
     http://www.littlecms.com for more info.
diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c
index e22310e99..737bc7cf3 100644
--- a/src/3rdparty/libmng/libmng_chunk_io.c
+++ b/src/3rdparty/libmng/libmng_chunk_io.c
@@ -3917,7 +3917,7 @@ READ_CHUNK (read_fram)
   mng_uint32 iNamelen;
 #endif
   mng_uint32 iRemain;
-  mng_uint32 iRetquired = 0;
+  mng_uint32 iRequired = 0;
 
 #ifdef MNG_SUPPORT_TRACE
   MNG_TRACE (pData, MNG_FN_READ_FRAM, MNG_LC_START)
@@ -3958,20 +3958,20 @@ READ_CHUNK (read_fram)
 
     if (iRemain)
     {
-      iRetquired = 4;                   /* calculate and check retquired remaining length */
+      iRequired = 4;                   /* calculate and check retquired remaining length */
 
-      if (*(pTemp+1)) { iRetquired += 4; }
-      if (*(pTemp+2)) { iRetquired += 4; }
-      if (*(pTemp+3)) { iRetquired += 17; }
+      if (*(pTemp+1)) { iRequired += 4; }
+      if (*(pTemp+2)) { iRequired += 4; }
+      if (*(pTemp+3)) { iRequired += 17; }
 
       if (*(pTemp+4))
       {
-        if ((iRemain - iRetquired) % 4 != 0)
+        if ((iRemain - iRequired) % 4 != 0)
           MNG_ERROR (pData, MNG_INVALIDLENGTH)
       }
       else
       {
-        if (iRemain != iRetquired)
+        if (iRemain != iRequired)
           MNG_ERROR (pData, MNG_INVALIDLENGTH)
       }
     }
@@ -4130,7 +4130,7 @@ READ_CHUNK (read_fram)
 
         if (((mng_framp)*ppChunk)->iChangesyncid)
         {
-          ((mng_framp)*ppChunk)->iCount        = (iRemain - iRetquired) / 4;
+          ((mng_framp)*ppChunk)->iCount        = (iRemain - iRequired) / 4;
 
           if (((mng_framp)*ppChunk)->iCount)
           {
diff --git a/src/3rdparty/libpng/example.c b/src/3rdparty/libpng/example.c
index 59fb26171..323130f57 100644
--- a/src/3rdparty/libpng/example.c
+++ b/src/3rdparty/libpng/example.c
@@ -98,7 +98,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
     * functions.  If you want to use the default stderr and longjump method,
     * you can supply NULL for the last three parameters.  We also supply the
     * the compiler header file version, so that we know if the application
-    * was compiled with a compatible version of the library.  RETQUIRED
+    * was compiled with a compatible version of the library.  REQUIRED
     */
    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
@@ -109,7 +109,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
       return (ERROR);
    }
 
-   /* Allocate/initialize the memory for image information.  RETQUIRED. */
+   /* Allocate/initialize the memory for image information.  REQUIRED. */
    info_ptr = png_create_info_struct(png_ptr);
    if (info_ptr == NULL)
    {
@@ -119,7 +119,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
    }
 
    /* Set error handling if you are using the setjmp/longjmp method (this is
-    * the normal method of doing things with libpng).  RETQUIRED unless you
+    * the normal method of doing things with libpng).  REQUIRED unless you
     * set up your own error handlers in the png_create_read_struct() earlier.
     */
 
@@ -132,7 +132,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
       return (ERROR);
    }
 
-   /* One of the following I/O initialization methods is RETQUIRED */
+   /* One of the following I/O initialization methods is REQUIRED */
 #ifdef streams /* PNG file I/O method 1 */
    /* Set up the input control if you are using standard C streams */
    png_init_io(png_ptr, fp);
@@ -162,7 +162,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
    /* OK, you're doing it the hard way, with the lower-level functions */
 
    /* The call to png_read_info() gives us all of the information from the
-    * PNG file before the first IDAT (image data chunk).  RETQUIRED
+    * PNG file before the first IDAT (image data chunk).  REQUIRED
     */
    png_read_info(png_ptr, info_ptr);
 
@@ -319,14 +319,14 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
    /* Add filler (or alpha) byte (before/after each RGB triplet) */
    png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
 
-   /* Turn on interlace handling.  RETQUIRED if you are not using
+   /* Turn on interlace handling.  REQUIRED if you are not using
     * png_read_image().  To see how to handle interlacing passes,
     * see the png_read_row() method below:
     */
    number_passes = png_set_interlace_handling(png_ptr);
 
    /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  RETQUIRED if you are expecting libpng to
+    * and update info structure.  REQUIRED if you are expecting libpng to
     * update the palette for you (ie you selected such a transform above).
     */
    png_read_update_info(png_ptr, info_ptr);
@@ -342,7 +342,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
          info_ptr));
    }
 
-   /* Now it's time to read the image.  One of these methods is RETQUIRED */
+   /* Now it's time to read the image.  One of these methods is REQUIRED */
 #ifdef entire /* Read the entire image in one go */
    png_read_image(png_ptr, row_pointers);
 
@@ -375,13 +375,13 @@ void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
    }
 #endif no_entire /* use only one of these two methods */
 
-   /* read rest of file, and get additional chunks in info_ptr - RETQUIRED */
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
    png_read_end(png_ptr, info_ptr);
 #endif hilevel
 
    /* At this point you have read the entire image */
 
-   /* clean up after the read, and free any memory allocated - RETQUIRED */
+   /* clean up after the read, and free any memory allocated - REQUIRED */
    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
 
    /* close the file */
@@ -566,7 +566,7 @@ void write_png(char *file_name /* , ... other image information ... */)
     * functions.  If you want to use the default stderr and longjump method,
     * you can supply NULL for the last three parameters.  We also check that
     * the library version is compatible with the one used at compile time,
-    * in case we are using dynamically linked libraries.  RETQUIRED.
+    * in case we are using dynamically linked libraries.  REQUIRED.
     */
    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
@@ -577,7 +577,7 @@ void write_png(char *file_name /* , ... other image information ... */)
       return (ERROR);
    }
 
-   /* Allocate/initialize the image information data.  RETQUIRED */
+   /* Allocate/initialize the image information data.  REQUIRED */
    info_ptr = png_create_info_struct(png_ptr);
    if (info_ptr == NULL)
    {
@@ -586,7 +586,7 @@ void write_png(char *file_name /* , ... other image information ... */)
       return (ERROR);
    }
 
-   /* Set error handling.  RETQUIRED if you aren't supplying your own
+   /* Set error handling.  REQUIRED if you aren't supplying your own
     * error handling functions in the png_create_write_struct() call.
     */
    if (setjmp(png_jmpbuf(png_ptr)))
@@ -597,7 +597,7 @@ void write_png(char *file_name /* , ... other image information ... */)
       return (ERROR);
    }
 
-   /* One of the following I/O initialization functions is RETQUIRED */
+   /* One of the following I/O initialization functions is REQUIRED */
 #ifdef streams /* I/O initialization method 1 */
    /* set up the output control if you are using standard C streams */
    png_init_io(png_ptr, fp);
@@ -624,12 +624,12 @@ void write_png(char *file_name /* , ... other image information ... */)
     * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
     * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
     * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
-    * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. RETQUIRED
+    * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
     */
    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
       PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
 
-   /* set the palette if there is one.  RETQUIRED for indexed-color images */
+   /* set the palette if there is one.  REQUIRED for indexed-color images */
    palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
              * sizeof (png_color));
    /* ... set palette colors ... */
@@ -676,7 +676,7 @@ void write_png(char *file_name /* , ... other image information ... */)
    /* note that if sRGB is present the gAMA and cHRM chunks must be ignored
     * on read and must be written in accordance with the sRGB profile */
 
-   /* Write the file header information.  RETQUIRED */
+   /* Write the file header information.  REQUIRED */
    png_write_info(png_ptr, info_ptr);
 
    /* If you want, you can write the info in two steps, in case you need to
@@ -744,7 +744,7 @@ void write_png(char *file_name /* , ... other image information ... */)
    for (k = 0; k < height; k++)
      row_pointers[k] = image + k*width*bytes_per_pixel;
 
-   /* One of the following output methods is RETQUIRED */
+   /* One of the following output methods is REQUIRED */
 #ifdef entire /* write out the entire image data in one call */
    png_write_image(png_ptr, row_pointers);
 
@@ -773,7 +773,7 @@ void write_png(char *file_name /* , ... other image information ... */)
     * register unknown chunks into the info structure to be written out.
     */
 
-   /* It is RETQUIRED to call this to finish writing the rest of the file */
+   /* It is REQUIRED to call this to finish writing the rest of the file */
    png_write_end(png_ptr, info_ptr);
 #endif hilevel
 
diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c
index f51a4edc7..269a6be0d 100644
--- a/src/3rdparty/libpng/pngread.c
+++ b/src/3rdparty/libpng/pngread.c
@@ -1381,7 +1381,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
    /* We don't handle adding filler bytes */
 
    /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  RETQUIRED if you are expecting libpng to
+    * and update info structure.  REQUIRED if you are expecting libpng to
     * update the palette for you (i.e., you selected such a transform above).
     */
    png_read_update_info(png_ptr, info_ptr);
@@ -1408,7 +1408,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
    png_read_image(png_ptr, info_ptr->row_pointers);
    info_ptr->valid |= PNG_INFO_IDAT;
 
-   /* read rest of file, and get additional chunks in info_ptr - RETQUIRED */
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
    png_read_end(png_ptr, info_ptr);
 
    if(transforms == 0 || params == NULL)
diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c
index b005a8d8a..91fc56978 100644
--- a/src/3rdparty/libpng/pngwrite.c
+++ b/src/3rdparty/libpng/pngwrite.c
@@ -1440,7 +1440,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
    if (info_ptr->valid & PNG_INFO_IDAT)
        png_write_image(png_ptr, info_ptr->row_pointers);
 
-   /* It is RETQUIRED to call this to finish writing the rest of the file */
+   /* It is REQUIRED to call this to finish writing the rest of the file */
    png_write_end(png_ptr, info_ptr);
 
    if(transforms == 0 || params == NULL)
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 40614d8ff..8e71552c6 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -91,7 +91,7 @@ public:
 };
 
 
-// UPDATED COMMENT RETQUIRED -- 2004-07-08 YamaKen
+// UPDATED COMMENT REQUIRED -- 2004-07-08 YamaKen
 /*!
     \class TQInputContext qinputcontext.h
     \brief The TQInputContext class abstracts the input method dependent data and composing state.
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 4d8519884..8fd6fd504 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -4009,7 +4009,7 @@ void TQWidget::show()
 	TQApplication::postEvent( parentWidget(),
 				 new TQEvent(TQEvent::LayoutHint) );
 
-    // Retquired for Mac, not sure whether we should always do that
+    // Required for Mac, not sure whether we should always do that
     if( isTopLevel() )
 	TQApplication::sendPostedEvents(0, TQEvent::LayoutHint);
 
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 7857d5fe2..1ed11172f 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -623,7 +623,7 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth )
 	useTranspExtChecked = TRUE;
     }
     if ( f.plane() && useTranspExt ) {
-	// Retquired to avoid non-transparent overlay visual(!) on some systems
+	// Required to avoid non-transparent overlay visual(!) on some systems
 	spec[i++] = GLX_TRANSPARENT_TYPE_EXT;
 	spec[i++] = f.rgba() ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT;
     }
diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index b197b797e..a15f0681d 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -316,7 +316,7 @@ struct TQSqlFieldInfoPrivate
     stored in TQSqlField objects.
 
     All values must be set in the constructor, and may be retrieved
-    using isRetquired(), type(), length(), precision(), defaultValue(),
+    using isRequired(), type(), length(), precision(), defaultValue(),
     name(), isGenerated() and typeID().
 */
 
@@ -453,7 +453,7 @@ TQSqlField TQSqlFieldInfo::toField() const
     allowed) or less than 0 if it cannot be determined whether the
     field is retquired or not.
 */
-int TQSqlFieldInfo::isRetquired() const
+int TQSqlFieldInfo::isRequired() const
 { return d->retquired; }
 
 /*!
diff --git a/src/sql/qsqlfield.h b/src/sql/qsqlfield.h
index 4811fbad9..ee6b3b051 100644
--- a/src/sql/qsqlfield.h
+++ b/src/sql/qsqlfield.h
@@ -130,7 +130,7 @@ public:
     bool operator==( const TQSqlFieldInfo& f ) const;
 
     TQSqlField		toField() const;
-    int			isRetquired() const;
+    int			isRequired() const;
     TQVariant::Type	type() const;
     int			length() const;
     int			precision() const;
diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h
index 9afc8cf16..ad3f0ba50 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/qglobal.h
@@ -177,10 +177,10 @@
 #endif
 
 #if defined(Q_OS_MACX)
-#  ifdef MAC_OS_X_VERSION_MIN_RETQUIRED
-#    undef MAC_OS_X_VERSION_MIN_RETQUIRED
+#  ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+#    undef MAC_OS_X_VERSION_MIN_REQUIRED
 #  endif
-#  define MAC_OS_X_VERSION_MIN_RETQUIRED MAC_OS_X_VERSION_10_2
+#  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_2
 #  include <AvailabilityMacros.h>
 #  if !defined(MAC_OS_X_VERSION_10_3)
 #     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp
index 3fdbd7550..fb09a89fa 100644
--- a/src/xml/qxml.cpp
+++ b/src/xml/qxml.cpp
@@ -1838,7 +1838,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
     and the name of the attribute in \a aName. It passes a string that
     represents the attribute type in \a type and a string that
     represents the attribute default in \a valueDefault. This string
-    is one of "#IMPLIED", "#RETQUIRED", "#FIXED" or TQString::null (if
+    is one of "#IMPLIED", "#REQUIRED", "#FIXED" or TQString::null (if
     none of the others applies). The reader passes the attribute's
     default value in \a value. If no default value is specified in the
     XML file, \a value is TQString::null.
@@ -5068,7 +5068,7 @@ bool TQXmlSimpleReader::parseAttlistDecl()
     const signed char Atttype          =  7; // parse the AttType
     const signed char Ws3              =  8; // whitespace read
     const signed char DDecH            =  9; // DefaultDecl with #
-    const signed char DefReq           = 10; // parse the string "RETQUIRED"
+    const signed char DefReq           = 10; // parse the string "REQUIRED"
     const signed char DefImp           = 11; // parse the string "IMPLIED"
     const signed char DefFix           = 12; // parse the string "FIXED"
     const signed char Attval           = 13; // parse the AttValue
@@ -5207,7 +5207,7 @@ bool TQXmlSimpleReader::parseAttlistDecl()
 		next();
 		break;
 	    case DefReq:
-		d->parseString_s = "RETQUIRED";
+		d->parseString_s = "REQUIRED";
 		if ( !parseString() ) {
 		    parseFailed( &TQXmlSimpleReader::parseAttlistDecl, state );
 		    return FALSE;