Update from latest conversion script

10 files changed, 17 insertions, 17 deletions

diff --git a/doc/html/functions.html b/doc/html/functions.html
index 60603f000..653896633 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -1433,8 +1433,8 @@ icon:
  <a href="qdir.html#isRelativePath">TQDir</a><li>isRelativeUrl:
  <a href="qurl.html#isRelativeUrl">TQUrl</a><li>isRenaming:
  <a href="qiconview.html#isRenaming">TQIconView</a> <a href="qlistview.html#isRenaming">TQListView</a><li>isReplaceable:
- <a href="qtableitem.html#isReplaceable">TQTableItem</a><li>isRetquired:
- <a href="qsqlfieldinfo.html#isRetquired">TQSqlFieldInfo</a><li>isResizeEnabled:
+ <a href="qtableitem.html#isReplaceable">TQTableItem</a><li>isRequired:
+ <a href="qsqlfieldinfo.html#isRequired">TQSqlFieldInfo</a><li>isResizeEnabled:
  <a href="qdockwindow.html#isResizeEnabled">TQDockWindow</a> <a href="qheader.html#isResizeEnabled">TQHeader</a><li>isRoot:
  <a href="qdir.html#isRoot">TQDir</a><li>isRowHidden:
  <a href="qtable.html#isRowHidden">TQTable</a><li>isRowReadOnly:
diff --git a/doc/html/gpl.html b/doc/html/gpl.html
index 6122b4629..fd4e7874b 100644
--- a/doc/html/gpl.html
+++ b/doc/html/gpl.html
@@ -309,7 +309,7 @@ TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING
diff --git a/doc/html/index b/doc/html/index
index 8cb7ae863..cc7ca3050 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -5972,7 +5972,7 @@
 "QSqlFieldInfo::defaultValue" qsqlfieldinfo.html#defaultValue
 "QSqlFieldInfo::isCalculated" qsqlfieldinfo.html#isCalculated
 "QSqlFieldInfo::isGenerated" qsqlfieldinfo.html#isGenerated
-"QSqlFieldInfo::isRetquired" qsqlfieldinfo.html#isRetquired
+"QSqlFieldInfo::isRequired" qsqlfieldinfo.html#isRequired
 "QSqlFieldInfo::isTrim" qsqlfieldinfo.html#isTrim
 "QSqlFieldInfo::length" qsqlfieldinfo.html#length
 "QSqlFieldInfo::name" qsqlfieldinfo.html#name
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 6616fb619..1d5932b80 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -209,10 +209,10 @@ body { background: #ffffff; color: black; }
 #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 &lt;AvailabilityMacros.h&gt;
 #  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/doc/html/qsqlfield-h.html b/doc/html/qsqlfield-h.html
index 632be144a..515c880af 100644
--- a/doc/html/qsqlfield-h.html
+++ b/doc/html/qsqlfield-h.html
@@ -165,7 +165,7 @@ public:
     bool operator==( const TQSqlFieldInfo&amp; f ) const;
 
     TQSqlField		toField() const;
-    int			isRetquired() const;
+    int			isRequired() const;
     TQVariant::Type	type() const;
     int			length() const;
     int			precision() const;
diff --git a/doc/html/qsqlfieldinfo-members.html b/doc/html/qsqlfieldinfo-members.html
index 78331918d..cadae9ea8 100644
--- a/doc/html/qsqlfieldinfo-members.html
+++ b/doc/html/qsqlfieldinfo-members.html
@@ -40,7 +40,7 @@ body { background: #ffffff; color: black; }
 <li><a href="qsqlfieldinfo.html#defaultValue">defaultValue</a>()
 <li><a href="qsqlfieldinfo.html#isCalculated">isCalculated</a>()
 <li><a href="qsqlfieldinfo.html#isGenerated">isGenerated</a>()
-<li><a href="qsqlfieldinfo.html#isRetquired">isRetquired</a>()
+<li><a href="qsqlfieldinfo.html#isRequired">isRequired</a>()
 <li><a href="qsqlfieldinfo.html#isTrim">isTrim</a>()
 <li><a href="qsqlfieldinfo.html#length">length</a>()
 <li><a href="qsqlfieldinfo.html#name">name</a>()
diff --git a/doc/html/qsqlfieldinfo.html b/doc/html/qsqlfieldinfo.html
index 20cc2e912..882010acb 100644
--- a/doc/html/qsqlfieldinfo.html
+++ b/doc/html/qsqlfieldinfo.html
@@ -44,7 +44,7 @@ body { background: #ffffff; color: black; }
 <li class=fn>TQSqlFieldInfo &amp; <a href="#operator-eq"><b>operator=</b></a> ( const&nbsp;TQSqlFieldInfo&nbsp;&amp;&nbsp;other )</li>
 <li class=fn>bool <a href="#operator-eq-eq"><b>operator==</b></a> ( const&nbsp;TQSqlFieldInfo&nbsp;&amp;&nbsp;f ) const</li>
 <li class=fn>TQSqlField <a href="#toField"><b>toField</b></a> () const</li>
-<li class=fn>int <a href="#isRetquired"><b>isRetquired</b></a> () const</li>
+<li class=fn>int <a href="#isRequired"><b>isRequired</b></a> () const</li>
 <li class=fn>TQVariant::Type <a href="#type"><b>type</b></a> () const</li>
 <li class=fn>int <a href="#length"><b>length</b></a> () const</li>
 <li class=fn>int <a href="#precision"><b>precision</b></a> () const</li>
@@ -67,7 +67,7 @@ The TQSqlFieldInfo class stores meta data associated with a SQL field.
 <p> TQSqlFieldInfo objects only store meta data; field values are
 stored in <a href="qsqlfield.html">TQSqlField</a> objects.
 <p> All values must be set in the constructor, and may be retrieved
-using <a href="#isRetquired">isRetquired</a>(), <a href="#type">type</a>(), <a href="#length">length</a>(), <a href="#precision">precision</a>(), <a href="#defaultValue">defaultValue</a>(),
+using <a href="#isRequired">isRequired</a>(), <a href="#type">type</a>(), <a href="#length">length</a>(), <a href="#precision">precision</a>(), <a href="#defaultValue">defaultValue</a>(),
 <a href="#name">name</a>(), <a href="#isGenerated">isGenerated</a>() and <a href="#typeID">typeID</a>().
 <p>See also <a href="database.html">Database Classes</a>.
 
@@ -135,7 +135,7 @@ Returns TRUE if the field should be included in auto-generated
 SQL statments, e.g. in <a href="qsqlcursor.html">TQSqlCursor</a>; otherwise returns FALSE.
 <p> <p>See also <a href="#setGenerated">setGenerated</a>().
 
-<h3 class=fn>int <a name="isRetquired"></a>TQSqlFieldInfo::isRetquired () const
+<h3 class=fn>int <a name="isRequired"></a>TQSqlFieldInfo::isRequired () const
 </h3>
 Returns a value greater than 0 if the field is retquired (NULL
 values are not allowed), 0 if it isn't retquired (NULL values are
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 107f90c70..0882ceb83 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -7035,7 +7035,7 @@
     <keyword ref="qsqlfieldinfo.html#defaultValue">defaultValue</keyword>
     <keyword ref="qsqlfieldinfo.html#isCalculated">isCalculated</keyword>
     <keyword ref="qsqlfieldinfo.html#isGenerated">isGenerated</keyword>
-    <keyword ref="qsqlfieldinfo.html#isRetquired">isRetquired</keyword>
+    <keyword ref="qsqlfieldinfo.html#isRequired">isRequired</keyword>
     <keyword ref="qsqlfieldinfo.html#isTrim">isTrim</keyword>
     <keyword ref="qsqlfieldinfo.html#length">length</keyword>
     <keyword ref="qsqlfieldinfo.html#name">name</keyword>
diff --git a/doc/html/qxmldeclhandler.html b/doc/html/qxmldeclhandler.html
index a7c4b2d2b..afbd325bd 100644
--- a/doc/html/qxmldeclhandler.html
+++ b/doc/html/qxmldeclhandler.html
@@ -73,7 +73,7 @@ attribute is reported.
 and the name of the attribute in <em>aName</em>. It passes a string that
 represents the attribute type in <em>type</em> and a string that
 represents the attribute default in <em>valueDefault</em>. This string
-is one of "#IMPLIED", "#RETQUIRED", "#FIXED" or <a href="qstring.html#TQString-null">TQString::null</a> (if
+is one of "#IMPLIED", "#REQUIRED", "#FIXED" or <a href="qstring.html#TQString-null">TQString::null</a> (if
 none of the others applies). The reader passes the attribute's
 default value in <em>value</em>. If no default value is specified in the
 XML file, <em>value</em> is TQString::null.
diff --git a/doc/man/man3/qsqlfieldinfo.3qt b/doc/man/man3/qsqlfieldinfo.3qt
index 3b36efcc8..c7b20c60a 100644
--- a/doc/man/man3/qsqlfieldinfo.3qt
+++ b/doc/man/man3/qsqlfieldinfo.3qt
@@ -35,7 +35,7 @@ QSqlFieldInfo \- Stores meta data associated with a SQL field
 .BI "QSqlField \fBtoField\fR () const"
 .br
 .ti -1c
-.BI "int \fBisRetquired\fR () const"
+.BI "int \fBisRequired\fR () const"
 .br
 .ti -1c
 .BI "QVariant::Type \fBtype\fR () const"
@@ -79,7 +79,7 @@ The QSqlFieldInfo class stores meta data associated with a SQL field.
 .PP
 QSqlFieldInfo objects only store meta data; field values are stored in QSqlField objects.
 .PP
-All values must be set in the constructor, and may be retrieved using isRetquired(), type(), length(), precision(), defaultValue(), name(), isGenerated() and typeID().
+All values must be set in the constructor, and may be retrieved using isRequired(), type(), length(), precision(), defaultValue(), name(), isGenerated() and typeID().
 .PP
 See also Database Classes.
 .SH MEMBER FUNCTION DOCUMENTATION
@@ -106,7 +106,7 @@ See also setCalculated().
 Returns TRUE if the field should be included in auto-generated SQL statments, e.g. in QSqlCursor; otherwise returns FALSE.
 .PP
 See also setGenerated().
-.SH "int QSqlFieldInfo::isRetquired () const"
+.SH "int QSqlFieldInfo::isRequired () const"
 Returns a value greater than 0 if the field is retquired (NULL values are not allowed), 0 if it isn't retquired (NULL values are allowed) or less than 0 if it cannot be determined whether the field is retquired or not.
 .SH "bool QSqlFieldInfo::isTrim () const"
 Returns TRUE if trailing whitespace should be removed from character fields; otherwise returns FALSE.