Sync with latest script

53 files changed, 85 insertions, 85 deletions

diff --git a/src/sql/README.module b/src/sql/README.module
index 308098bf9..511d90e83 100644
--- a/src/sql/README.module
+++ b/src/sql/README.module
@@ -21,7 +21,7 @@ library, configure Qt like this:
 	./configure -qt-sql-psql
 
 In addition, you may need to specify an extra include path, as some
-database drivers retquire headers for the database they are using,
+database drivers require headers for the database they are using,
 for example:
 
 	./configure -qt-sql-psql -I/usr/local/include
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp
index 5e46b9b49..4c841e5f1 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/qsqlcachedresult.cpp
@@ -17,7 +17,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:
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index 1cdae7ae2..6d78f39de 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -16,7 +16,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:
diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h
index c0e8717de..fcb738513 100644
--- a/src/sql/drivers/ibase/qsql_ibase.h
+++ b/src/sql/drivers/ibase/qsql_ibase.h
@@ -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:
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index b0afb436d..10448414e 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.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:
diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h
index d47aa6ea9..4d4c7b1e5 100644
--- a/src/sql/drivers/mysql/qsql_mysql.h
+++ b/src/sql/drivers/mysql/qsql_mysql.h
@@ -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:
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 4d0f7969f..9851e1cb1 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.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:
@@ -450,18 +450,18 @@ static TQSqlFieldInfo qMakeFieldInfo( const SQLHANDLE hStmt, const TQODBCPrivate
     bool isNull;
     TQString fname = qGetStringData( hStmt, 3, -1, isNull, p->unicode );
     int type = qGetIntData( hStmt, 4, isNull ); // column type
-    int retquired = qGetIntData( hStmt, 10, isNull ); // nullable-flag
-    // retquired can be SQL_NO_NULLS, SQL_NULLABLE or SQL_NULLABLE_UNKNOWN
-    if ( retquired == SQL_NO_NULLS ) {
-	retquired = 1;
-    } else if ( retquired == SQL_NULLABLE ) {
-	retquired = 0;
+    int required = qGetIntData( hStmt, 10, isNull ); // nullable-flag
+    // required can be SQL_NO_NULLS, SQL_NULLABLE or SQL_NULLABLE_UNKNOWN
+    if ( required == SQL_NO_NULLS ) {
+	required = 1;
+    } else if ( required == SQL_NULLABLE ) {
+	required = 0;
     } else {
-	retquired = -1;
+	required = -1;
     }
     int size = qGetIntData( hStmt, 6, isNull ); // column size
     int prec = qGetIntData( hStmt, 8, isNull ); // precision
-    return TQSqlFieldInfo( fname, qDecodeODBCType( type, p ), retquired, size, prec, TQVariant(), type );
+    return TQSqlFieldInfo( fname, qDecodeODBCType( type, p ), required, size, prec, TQVariant(), type );
 }
 
 static TQSqlFieldInfo qMakeFieldInfo( const TQODBCPrivate* p, int i  )
@@ -495,16 +495,16 @@ static TQSqlFieldInfo qMakeFieldInfo( const TQODBCPrivate* p, int i  )
     TQString qColName = TQString::fromLocal8Bit( (const char*)colName );
 #endif
     // nullable can be SQL_NO_NULLS, SQL_NULLABLE or SQL_NULLABLE_UNKNOWN
-    int retquired = -1;
+    int required = -1;
     if ( nullable == SQL_NO_NULLS ) {
-	retquired = 1;
+	required = 1;
     } else if ( nullable == SQL_NULLABLE ) {
-	retquired = 0;
+	required = 0;
     }
     TQVariant::Type type = qDecodeODBCType( colType, p );
     return TQSqlFieldInfo( qColName,
     			  type,
-    			  retquired,
+    			  required,
     			  (int)colSize == 0 ? -1 : (int)colSize,
     			  (int)colScale == 0 ? -1 : (int)colScale,
     			  TQVariant(),
@@ -1590,7 +1590,7 @@ bool TQODBCPrivate::checkDriver() const
 
 
     int i;
-    // check the retquired functions
+    // check the required functions
     for ( i = 0; reqFunc[ i ] != 0; ++i ) {
 
 	r = SQLGetFunctions( hDbc, reqFunc[ i ], &sup );
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h
index b65acf6ca..8583dced4 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -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:
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 99df0fdfb..788a69358 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.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:
diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h
index 217cfe45e..bed3ebbc9 100644
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
@@ -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:
diff --git a/src/sql/qdatabrowser.cpp b/src/sql/qdatabrowser.cpp
index b1dc0bddd..c9570deb2 100644
--- a/src/sql/qdatabrowser.cpp
+++ b/src/sql/qdatabrowser.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:
diff --git a/src/sql/qdatabrowser.h b/src/sql/qdatabrowser.h
index b7aee2bf8..3c991bfcf 100644
--- a/src/sql/qdatabrowser.h
+++ b/src/sql/qdatabrowser.h
@@ -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:
diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp
index 8edc7f230..bd3708eda 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/qdatatable.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:
diff --git a/src/sql/qdatatable.h b/src/sql/qdatatable.h
index 7b789ca78..46d9c7e34 100644
--- a/src/sql/qdatatable.h
+++ b/src/sql/qdatatable.h
@@ -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:
diff --git a/src/sql/qdataview.cpp b/src/sql/qdataview.cpp
index 1a73dc6f5..a689025f0 100644
--- a/src/sql/qdataview.cpp
+++ b/src/sql/qdataview.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:
diff --git a/src/sql/qdataview.h b/src/sql/qdataview.h
index e45227b2f..90f488356 100644
--- a/src/sql/qdataview.h
+++ b/src/sql/qdataview.h
@@ -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:
diff --git a/src/sql/qeditorfactory.cpp b/src/sql/qeditorfactory.cpp
index dc2c4f62f..6f5fb7f36 100644
--- a/src/sql/qeditorfactory.cpp
+++ b/src/sql/qeditorfactory.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:
diff --git a/src/sql/qeditorfactory.h b/src/sql/qeditorfactory.h
index 7f3428f77..2798c5939 100644
--- a/src/sql/qeditorfactory.h
+++ b/src/sql/qeditorfactory.h
@@ -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:
diff --git a/src/sql/qsql.cpp b/src/sql/qsql.cpp
index c2932fbe0..42d59c004 100644
--- a/src/sql/qsql.cpp
+++ b/src/sql/qsql.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:
diff --git a/src/sql/qsql.h b/src/sql/qsql.h
index 3fcbfc7f4..b4fddae1a 100644
--- a/src/sql/qsql.h
+++ b/src/sql/qsql.h
@@ -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:
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
index 5ec8b754a..e5949951b 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/qsqlcursor.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:
@@ -178,7 +178,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
     functions also return a pointer to the edit buffer and prepare it
     for insert, update and delete respectively. Edit operations only
     affect a single row at a time. Note that update() and del()
-    retquire that the table or view contain a primaryIndex() to ensure
+    require that the table or view contain a primaryIndex() to ensure
     that edit operations affect a unique record within the database.
 
     For example:
diff --git a/src/sql/qsqlcursor.h b/src/sql/qsqlcursor.h
index 8c00f7132..8670ef6f8 100644
--- a/src/sql/qsqlcursor.h
+++ b/src/sql/qsqlcursor.h
@@ -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:
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index e54fd124d..6d01cf419 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.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:
@@ -865,7 +865,7 @@ bool TQSqlDatabase::rollback()
     }
     ...
     \endcode
-    ("FIL" is the retquired spelling in Microsoft's API.)
+    ("FIL" is the required spelling in Microsoft's API.)
 
     There is no default value.
 */
@@ -1136,7 +1136,7 @@ TQSqlRecordInfo TQSqlDatabase::recordInfo( const TQSqlQuery& query ) const
     \i connect_timeout
     \i options
     \i tty
-    \i retquiressl
+    \i requiressl
     \i service
     \endlist
 
@@ -1168,7 +1168,7 @@ TQSqlRecordInfo TQSqlDatabase::recordInfo( const TQSqlQuery& query ) const
     }
     ...
     // PostgreSQL connection
-    db->setConnectOptions( "retquiressl=1" ); // enable PostgreSQL SSL connections
+    db->setConnectOptions( "requiressl=1" ); // enable PostgreSQL SSL connections
     if ( !db->open() ) {
         db->setConnectOptions(); // clear options
 	...
diff --git a/src/sql/qsqldatabase.h b/src/sql/qsqldatabase.h
index bd679278c..2fd6d4917 100644
--- a/src/sql/qsqldatabase.h
+++ b/src/sql/qsqldatabase.h
@@ -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:
diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp
index 522011e80..6ecbdca88 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/qsqldriver.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:
diff --git a/src/sql/qsqldriver.h b/src/sql/qsqldriver.h
index 68ed94fc4..b312d3a0d 100644
--- a/src/sql/qsqldriver.h
+++ b/src/sql/qsqldriver.h
@@ -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:
diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h
index dd2f539bb..bfc5dc316 100644
--- a/src/sql/qsqldriverinterface_p.h
+++ b/src/sql/qsqldriverinterface_p.h
@@ -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:
diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp
index ff3620e5c..fe294ba09 100644
--- a/src/sql/qsqldriverplugin.cpp
+++ b/src/sql/qsqldriverplugin.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:
@@ -80,7 +80,7 @@
     \fn TQSqlDriver* TQSqlDriverPlugin::create( const TQString& key )
 
     Creates and returns a TQSqlDriver object for the driver key \a key.
-    The driver key is usually the class name of the retquired driver.
+    The driver key is usually the class name of the required driver.
 
     \sa keys()
 */
diff --git a/src/sql/qsqldriverplugin.h b/src/sql/qsqldriverplugin.h
index 591c384b1..54c05b692 100644
--- a/src/sql/qsqldriverplugin.h
+++ b/src/sql/qsqldriverplugin.h
@@ -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:
diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/qsqleditorfactory.cpp
index 72afcd188..55a6d5a7e 100644
--- a/src/sql/qsqleditorfactory.cpp
+++ b/src/sql/qsqleditorfactory.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:
diff --git a/src/sql/qsqleditorfactory.h b/src/sql/qsqleditorfactory.h
index f8d2c1339..48757d480 100644
--- a/src/sql/qsqleditorfactory.h
+++ b/src/sql/qsqleditorfactory.h
@@ -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:
diff --git a/src/sql/qsqlerror.cpp b/src/sql/qsqlerror.cpp
index 9dce821f9..1d3d1e7df 100644
--- a/src/sql/qsqlerror.cpp
+++ b/src/sql/qsqlerror.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:
diff --git a/src/sql/qsqlerror.h b/src/sql/qsqlerror.h
index abe6f2fe7..7eb29f027 100644
--- a/src/sql/qsqlerror.h
+++ b/src/sql/qsqlerror.h
@@ -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:
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp
index 21a6d2104..71508753f 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/qsqlextension_p.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:
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index e8b1a2c53..cd189d926 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -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:
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
diff --git a/src/sql/qsqlfield.h b/src/sql/qsqlfield.h
index ee6b3b051..b81717c7a 100644
--- a/src/sql/qsqlfield.h
+++ b/src/sql/qsqlfield.h
@@ -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:
@@ -115,7 +115,7 @@ class TQM_EXPORT_SQL TQSqlFieldInfo
 public:
     TQSqlFieldInfo( const TQString& name = TQString::null,
 		   TQVariant::Type typ = TQVariant::Invalid,
-		   int retquired = -1,
+		   int required = -1,
 		   int len = -1,
 		   int prec = -1,
 		   const TQVariant& defValue = TQVariant(),
diff --git a/src/sql/qsqlform.cpp b/src/sql/qsqlform.cpp
index 726597442..07d0ef4e3 100644
--- a/src/sql/qsqlform.cpp
+++ b/src/sql/qsqlform.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:
diff --git a/src/sql/qsqlform.h b/src/sql/qsqlform.h
index 8b13816fe..7ca157c0f 100644
--- a/src/sql/qsqlform.h
+++ b/src/sql/qsqlform.h
@@ -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:
diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp
index 251e9ef28..06f17eca8 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/qsqlindex.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:
diff --git a/src/sql/qsqlindex.h b/src/sql/qsqlindex.h
index 9985053bc..61df18aa3 100644
--- a/src/sql/qsqlindex.h
+++ b/src/sql/qsqlindex.h
@@ -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:
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 100512623..1ca0d5f30 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.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:
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h
index 660e4dded..fd442ead6 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/qsqlmanager_p.h
@@ -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:
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index 55699e569..98f3fd159 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.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:
diff --git a/src/sql/qsqlpropertymap.h b/src/sql/qsqlpropertymap.h
index a326475d5..2054b134a 100644
--- a/src/sql/qsqlpropertymap.h
+++ b/src/sql/qsqlpropertymap.h
@@ -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:
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index c33eb8bf2..98b481811 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.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:
@@ -144,13 +144,13 @@ void TQSqlResultShared::slotResultDestroyed()
 
     TQSqlQuery supports prepared query execution and the binding of
     parameter values to placeholders. Some databases don't support
-    these features, so for them TQt emulates the retquired
+    these features, so for them TQt emulates the required
     functionality. For example, the Oracle and ODBC drivers have
     proper prepared query support, and TQt makes use of it; but for
     databases that don't have this support, TQt implements the feature
     itself, e.g. by replacing placeholders with actual values when a
     query is executed. The exception is positional binding using named
-    placeholders, which retquires that the database supports prepared
+    placeholders, which requires that the database supports prepared
     queries.
 
     Oracle databases identify placeholders by using a colon-name
diff --git a/src/sql/qsqlquery.h b/src/sql/qsqlquery.h
index bc4efa7d9..8ea2462e4 100644
--- a/src/sql/qsqlquery.h
+++ b/src/sql/qsqlquery.h
@@ -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:
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp
index 3bbe2d045..f8489b0e0 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/qsqlrecord.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:
diff --git a/src/sql/qsqlrecord.h b/src/sql/qsqlrecord.h
index 9fd499364..405961df9 100644
--- a/src/sql/qsqlrecord.h
+++ b/src/sql/qsqlrecord.h
@@ -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:
diff --git a/src/sql/qsqlresult.cpp b/src/sql/qsqlresult.cpp
index 6407064d4..d0550f329 100644
--- a/src/sql/qsqlresult.cpp
+++ b/src/sql/qsqlresult.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:
diff --git a/src/sql/qsqlresult.h b/src/sql/qsqlresult.h
index 52874db56..5b72b7f94 100644
--- a/src/sql/qsqlresult.h
+++ b/src/sql/qsqlresult.h
@@ -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:
diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/qsqlselectcursor.cpp
index 037a79854..f14d2d378 100644
--- a/src/sql/qsqlselectcursor.cpp
+++ b/src/sql/qsqlselectcursor.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:
diff --git a/src/sql/qsqlselectcursor.h b/src/sql/qsqlselectcursor.h
index f1c03611f..91d5c4d6a 100644
--- a/src/sql/qsqlselectcursor.h
+++ b/src/sql/qsqlselectcursor.h
@@ -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: