Sync with latest script

1 files changed, 12 insertions, 12 deletions

diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index a15f0681d..95c798676 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -18,7 +18,7 @@
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
@@ -295,7 +295,7 @@ void TQSqlField::setReadOnly( bool readOnly )
 
 struct TQSqlFieldInfoPrivate
 {
-    int retquired, len, prec, typeID;
+    int required, len, prec, typeID;
     uint generated: 1;
     uint trim: 1;
     uint calculated: 1;
@@ -325,9 +325,9 @@ struct TQSqlFieldInfoPrivate
     \table
     \row \i \a name  \i the name of the field.
     \row \i \a typ   \i the field's type in a TQVariant.
-    \row \i \a retquired  \i greater than 0 if the field is retquired, 0
+    \row \i \a required  \i greater than 0 if the field is required, 0
     if its value can be NULL and less than 0 if it cannot be
-    determined whether the field is retquired or not.
+    determined whether the field is required or not.
     \row \i \a len  \i the length of the field. Note that for
     non-character types some databases return either the length in
     bytes or the number of digits. -1 signifies that the length cannot
@@ -352,7 +352,7 @@ struct TQSqlFieldInfoPrivate
 */
 TQSqlFieldInfo::TQSqlFieldInfo( const TQString& name,
 		   TQVariant::Type typ,
-		   int retquired,
+		   int required,
 		   int len,
 		   int prec,
 		   const TQVariant& defValue,
@@ -364,7 +364,7 @@ TQSqlFieldInfo::TQSqlFieldInfo( const TQString& name,
     d = new TQSqlFieldInfoPrivate();
     d->name = name;
     d->typ = typ;
-    d->retquired = retquired;
+    d->required = required;
     d->len = len;
     d->prec = prec;
     d->defValue = defValue;
@@ -392,7 +392,7 @@ TQSqlFieldInfo::TQSqlFieldInfo( const TQSqlField & other, bool generated )
     d = new TQSqlFieldInfoPrivate();
     d->name = other.name();
     d->typ = other.type();
-    d->retquired = -1;
+    d->required = -1;
     d->len = -1;
     d->prec = -1;
     d->typeID = 0;
@@ -430,7 +430,7 @@ bool TQSqlFieldInfo::operator==( const TQSqlFieldInfo& f ) const
 {
     return ( d->name == f.d->name &&
 		d->typ == f.d->typ &&
-		d->retquired == f.d->retquired &&
+		d->required == f.d->required &&
 		d->len == f.d->len &&
 		d->prec == f.d->prec &&
 		d->defValue == f.d->defValue &&
@@ -448,13 +448,13 @@ TQSqlField TQSqlFieldInfo::toField() const
 { return TQSqlField( d->name, d->typ ); }
 
 /*!
-    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
+    Returns a value greater than 0 if the field is required (NULL
+    values are not allowed), 0 if it isn't required (NULL values are
     allowed) or less than 0 if it cannot be determined whether the
-    field is retquired or not.
+    field is required or not.
 */
 int TQSqlFieldInfo::isRequired() const
-{ return d->retquired; }
+{ return d->required; }
 
 /*!
     Returns the field's type or TQVariant::Invalid if the type is