Rename nt* sql related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

65 files changed, 263 insertions, 263 deletions

diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 2e4c2caaa..bd8ffe7ba 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -44,7 +44,7 @@
 #include "ntqrect.h"
 #include "ntqbitarray.h"
 #include "ntqregion.h"
-#include "ntqsql.h"
+#include "tqsql.h"
 #include "ntqstrlist.h"
 #include "ntqvaluelist.h"
 #include "ntqmap.h"
@@ -80,7 +80,7 @@
 #include <ntqcombobox.h>
 #include "ntqgroupbox.h"
 #include "ntqdialog.h"
-#include <ntqdataview.h>
+#include <tqdataview.h>
 #include "ntqdockwindow.h"
 #include "ntqcommonstyle.h"
 #include "ntqnetworkprotocol.h"
@@ -141,7 +141,7 @@
 #include <ntqftp.h>
 #include "ntqguardedptr.h"
 #include <tqobjectcleanuphandler.h>
-#include "ntqsqlfield.h"
+#include "tqsqlfield.h"
 #include <tqobjectdict.h>
 #include <tqobjectlist.h>
 #include <ntqcolordialog.h>
@@ -201,21 +201,21 @@
 #include <ntqspinbox.h>
 #include <ntqsplashscreen.h>
 #include <ntqsplitter.h>
-#include "ntqsqlerror.h"
-#include "ntqeditorfactory.h"
-#include "ntqsqlquery.h"
-#include "ntqsqlrecord.h"
-#include <ntqsqldriverplugin.h>
-#include "ntqsqlindex.h"
-#include "ntqsqlcursor.h"
-#include <ntqsqldriver.h>
-#include <ntqsqlform.h>
+#include "tqsqlerror.h"
+#include "tqeditorfactory.h"
+#include "tqsqlquery.h"
+#include "tqsqlrecord.h"
+#include <tqsqldriverplugin.h>
+#include "tqsqlindex.h"
+#include "tqsqlcursor.h"
+#include <tqsqldriver.h>
+#include <tqsqlform.h>
 #include "ntqtable.h"
-#include <ntqsqlpropertymap.h>
-#include <ntqsqldatabase.h>
-#include <ntqdatabrowser.h>
-#include <ntqsqlresult.h>
-#include <ntqsqlselectcursor.h>
+#include <tqsqlpropertymap.h>
+#include <tqsqldatabase.h>
+#include <tqdatabrowser.h>
+#include <tqsqlresult.h>
+#include <tqsqlselectcursor.h>
 #include <ntqstatusbar.h>
 #include <ntqmenubar.h>
 #include <ntqcanvas.h>
@@ -227,7 +227,7 @@
 #include "ntqtextedit.h"
 #include <ntqsyntaxhighlighter.h>
 #include <ntqtabdialog.h>
-#include "ntqsqleditorfactory.h"
+#include "tqsqleditorfactory.h"
 #include <ntqtabwidget.h>
 #include <ntqtextbrowser.h>
 #include <ntqbig5codec.h>
@@ -253,7 +253,7 @@
 #include <ntqasyncimageio.h>
 #include <ntqvaluestack.h>
 #include <ntqvaluevector.h>
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
 #include <ntqvbox.h>
 #include <ntqvbuttongroup.h>
 #include <ntqvfbhdr.h>
@@ -287,8 +287,8 @@
 #include "private/qeffects_p.h"
 #include "private/qgpluginmanager_p.h"
 #include "private/qinternal_p.h"
-#include "private/qsqldriverinterface_p.h"
-#include "private/qsqlmanager_p.h"
+#include "private/tqsqldriverinterface_p.h"
+#include "private/tqsqlmanager_p.h"
 #include "private/qlock_p.h"
 #include "private/qcomponentfactory_p.h"
 #include "private/qstyleinterface_p.h"
@@ -303,7 +303,7 @@
 #include "private/qpluginmanager_p.h"
 #include "private/qdir_p.h"
 #include "private/qsettings_p.h"
-#include "private/qsqlextension_p.h"
+#include "private/tqsqlextension_p.h"
 #include "private/qdialogbuttons_p.h"
 #include "private/qwidgetinterface_p.h"
 #include "private/qwidgetresizehandler_p.h"
diff --git a/src/libqt.map b/src/libqt.map
index af836dc6c..3b9bae5b8 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -32,7 +32,7 @@
 	QSmSocketReceiver::*;
 	QSpinBoxValidator::*;
 	QSplitterHandle::*;
-	QSqlRecordShared::*;
+	TQSqlRecordShared::*;
 	QSVChildRec::*;
 	qt_xdnd_*;
 	QTipLabel::*;
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/tqsqlcachedresult.cpp
index aa3a0ac14..6b0b77e35 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/tqsqlcachedresult.cpp
@@ -37,7 +37,7 @@
 **
 **********************************************************************/
 
-#include "qsqlcachedresult.h"
+#include "tqsqlcachedresult.h"
 #include <ntqdatetime.h>
 
 #ifndef TQT_NO_SQL
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/tqsqlcachedresult.h
index 42d1d1ec5..f31c3853f 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/tqsqlcachedresult.h
@@ -55,7 +55,7 @@
 #include <ntqvariant.h>
 #include <ntqptrvector.h>
 #include <ntqvaluevector.h>
-#include <ntqsqlresult.h>
+#include <tqsqlresult.h>
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/tqsql_ibase.cpp
index ee2976d68..e96d15b6a 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/tqsql_ibase.cpp
@@ -12,10 +12,10 @@
 **
 ****************************************************************************/
 
-#include "qsql_ibase.h"
+#include "tqsql_ibase.h"
 
 #include <ntqdatetime.h>
-#include <private/qsqlextension_p.h>
+#include <private/tqsqlextension_p.h>
 
 #include <ibase.h>
 #include <stdlib.h>
diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/tqsql_ibase.h
index 023a6b028..74eb58509 100644
--- a/src/sql/drivers/ibase/qsql_ibase.h
+++ b/src/sql/drivers/ibase/tqsql_ibase.h
@@ -41,9 +41,9 @@
 #ifndef TQSQL_IBASE_H
 #define TQSQL_IBASE_H
 
-#include "ntqsqlresult.h"
-#include "ntqsqldriver.h"
-#include "../cache/qsqlcachedresult.h"
+#include "tqsqlresult.h"
+#include "tqsqldriver.h"
+#include "../cache/tqsqlcachedresult.h"
 
 
 class TQIBaseDriverPrivate;
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/tqsql_mysql.cpp
index dc5a40cac..3854a5bb3 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/tqsql_mysql.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qsql_mysql.h"
-#include <private/qsqlextension_p.h>
+#include "tqsql_mysql.h"
+#include <private/tqsqlextension_p.h>
 
 #include <ntqdatetime.h>
 #include <ntqvaluevector.h>
-#include <ntqsqlrecord.h>
+#include <tqsqlrecord.h>
 
 #define TQMYSQL_DRIVER_NAME "TQMYSQL3"
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/tqsql_mysql.h
index f2266af03..a0d3ca93b 100644
--- a/src/sql/drivers/mysql/qsql_mysql.h
+++ b/src/sql/drivers/mysql/tqsql_mysql.h
@@ -41,10 +41,10 @@
 #ifndef TQSQL_MYSQL_H
 #define TQSQL_MYSQL_H
 
-#include <ntqsqldriver.h>
-#include <ntqsqlresult.h>
-#include <ntqsqlfield.h>
-#include <ntqsqlindex.h>
+#include <tqsqldriver.h>
+#include <tqsqlresult.h>
+#include <tqsqlfield.h>
+#include <tqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
diff --git a/src/sql/drivers/odbc/debian_qsql_odbc.h b/src/sql/drivers/odbc/debian_tqsql_odbc.h
index 4b91f475c..4b91f475c 100644
--- a/src/sql/drivers/odbc/debian_qsql_odbc.h
+++ b/src/sql/drivers/odbc/debian_tqsql_odbc.h
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp
index e4141f27f..605948ca1 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/tqsql_odbc.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qsql_odbc.h"
-#include <ntqsqlrecord.h>
+#include "tqsql_odbc.h"
+#include <tqsqlrecord.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
 #include <ntqapplication.h>
 #endif
 #include <ntqdatetime.h>
-#include <private/qsqlextension_p.h>
+#include <private/tqsqlextension_p.h>
 #include <private/qinternal_p.h>
 #include <stdlib.h>
 
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h
index 2fa820810..3948b087a 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/tqsql_odbc.h
@@ -43,10 +43,10 @@
 
 #include <ntqmap.h>
 #include <ntqstring.h>
-#include <ntqsqldriver.h>
-#include <ntqsqlfield.h>
-#include <ntqsqlresult.h>
-#include <ntqsqlindex.h>
+#include <tqsqldriver.h>
+#include <tqsqlfield.h>
+#include <tqsqlresult.h>
+#include <tqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
@@ -79,7 +79,7 @@
 #endif
 
 #include <sqlext.h>
-#include "debian_qsql_odbc.h"
+#include "debian_tqsql_odbc.h"
 
 class TQODBCPrivate;
 class TQODBCDriver;
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp
index 7a12fe8c6..1ea64fb75 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/tqsql_psql.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qsql_psql.h"
-#include <private/qsqlextension_p.h>
+#include "tqsql_psql.h"
+#include <private/tqsqlextension_p.h>
 
 #include <math.h>
 
 #include <ntqpointarray.h>
-#include <ntqsqlrecord.h>
+#include <tqsqlrecord.h>
 #include <ntqregexp.h>
 #include <ntqdatetime.h>
 // PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG.
diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/tqsql_psql.h
index 841ff568d..61f30a581 100644
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/tqsql_psql.h
@@ -41,9 +41,9 @@
 #ifndef TQSQL_PSQL_H
 #define TQSQL_PSQL_H
 
-#include <ntqsqlresult.h>
-#include <ntqsqlfield.h>
-#include <ntqsqldriver.h>
+#include <tqsqlresult.h>
+#include <tqsqlfield.h>
+#include <tqsqldriver.h>
 #include <libpq-fe.h>
 
 #ifdef QT_PLUGIN
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index 110eccfc2..3f0053d39 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -12,7 +12,7 @@
 **
 ****************************************************************************/
 
-#include "qsql_sqlite.h"
+#include "tqsql_sqlite.h"
 
 #include <ntqdatetime.h>
 #include <ntqregexp.h>
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/tqsql_sqlite.h
index b90662c01..35af38a62 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.h
@@ -15,11 +15,11 @@
 #ifndef TQSQL_SQLITE_H
 #define TQSQL_SQLITE_H
 
-#include <ntqsqldriver.h>
-#include <ntqsqlresult.h>
-#include <ntqsqlrecord.h>
-#include <ntqsqlindex.h>
-#include "../cache/qsqlcachedresult.h"
+#include <tqsqldriver.h>
+#include <tqsqlresult.h>
+#include <tqsqlrecord.h>
+#include <tqsqlindex.h>
+#include "../cache/tqsqlcachedresult.h"
 
 #if (TQT_VERSION-0 >= 0x030000)
 typedef TQVariant TQSqlVariant;
diff --git a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index 763c648a0..61edda2c0 100644
--- a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -12,7 +12,7 @@
 **
 ****************************************************************************/
 
-#include "qsql_sqlite3.h"
+#include "tqsql_sqlite3.h"
 
 #include <ntqdatetime.h>
 #include <ntqvaluevector.h>
diff --git a/src/sql/drivers/sqlite3/qsql_sqlite3.h b/src/sql/drivers/sqlite3/tqsql_sqlite3.h
index facd85a1d..ba60879e3 100644
--- a/src/sql/drivers/sqlite3/qsql_sqlite3.h
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.h
@@ -15,11 +15,11 @@
 #ifndef TQSQL_SQLITE3_H
 #define TQSQL_SQLITE3_H
 
-#include <ntqsqldriver.h>
-#include <ntqsqlresult.h>
-#include <ntqsqlrecord.h>
-#include <ntqsqlindex.h>
-#include "qsqlcachedresult.h"
+#include <tqsqldriver.h>
+#include <tqsqlresult.h>
+#include <tqsqlrecord.h>
+#include <tqsqlindex.h>
+#include "tqsqlcachedresult.h"
 
 #if (TQT_VERSION-0 >= 0x030200)
 typedef TQVariant TQSqlVariant;
diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
index fea3c9d59..6330a1b88 100644
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@@ -8,58 +8,58 @@ sql {
 	}
 	
 	SQL_P	    = sql
-	HEADERS     += $$SQL_H/ntqsql.h \
-		    $$SQL_H/ntqsqlquery.h \
-		    $$SQL_H/ntqsqldatabase.h \
-		    $$SQL_H/ntqsqlfield.h \
-		    $$SQL_H/ntqsqlrecord.h \
-		    $$SQL_H/ntqsqlcursor.h \
-		    $$SQL_H/ntqsqlform.h \
-		    $$SQL_H/ntqeditorfactory.h \
-		    $$SQL_H/ntqsqleditorfactory.h \
-		    $$SQL_H/ntqsqldriver.h \
-		    $$SQL_P/qsqldriverinterface_p.h \
-		    $$SQL_P/qsqlextension_p.h \
-		    $$SQL_H/ntqsqldriverplugin.h \
-		    $$SQL_H/ntqsqlerror.h \
-		    $$SQL_H/ntqsqlresult.h \
-		    $$SQL_H/ntqsqlindex.h \
-		    $$SQL_H/ntqsqlpropertymap.h \
-		    $$SQL_P/qsqlmanager_p.h \
-		    $$SQL_H/ntqdatatable.h \
-		    $$SQL_H/ntqdataview.h \
-		    $$SQL_H/ntqdatabrowser.h \
-		    $$SQL_H/ntqsqlselectcursor.h 
+	HEADERS     += $$SQL_H/tqsql.h \
+		    $$SQL_H/tqsqlquery.h \
+		    $$SQL_H/tqsqldatabase.h \
+		    $$SQL_H/tqsqlfield.h \
+		    $$SQL_H/tqsqlrecord.h \
+		    $$SQL_H/tqsqlcursor.h \
+		    $$SQL_H/tqsqlform.h \
+		    $$SQL_H/tqeditorfactory.h \
+		    $$SQL_H/tqsqleditorfactory.h \
+		    $$SQL_H/tqsqldriver.h \
+		    $$SQL_P/tqsqldriverinterface_p.h \
+		    $$SQL_P/tqsqlextension_p.h \
+		    $$SQL_H/tqsqldriverplugin.h \
+		    $$SQL_H/tqsqlerror.h \
+		    $$SQL_H/tqsqlresult.h \
+		    $$SQL_H/tqsqlindex.h \
+		    $$SQL_H/tqsqlpropertymap.h \
+		    $$SQL_P/tqsqlmanager_p.h \
+		    $$SQL_H/tqdatatable.h \
+		    $$SQL_H/tqdataview.h \
+		    $$SQL_H/tqdatabrowser.h \
+		    $$SQL_H/tqsqlselectcursor.h 
 
-	SOURCES     += $$SQL_CPP/qsqlquery.cpp \
-		    $$SQL_CPP/qsqldatabase.cpp \
-		    $$SQL_CPP/qsqlfield.cpp \
-		    $$SQL_CPP/qsqlrecord.cpp \
-		    $$SQL_CPP/qsqlform.cpp \
-		    $$SQL_CPP/qsqlcursor.cpp \
-		    $$SQL_CPP/qeditorfactory.cpp \
-		    $$SQL_CPP/qsqleditorfactory.cpp \
-		    $$SQL_CPP/qsqldriver.cpp \
-		    $$SQL_CPP/qsqlextension_p.cpp \
-		    $$SQL_CPP/qsqldriverplugin.cpp \
-		    $$SQL_CPP/qsqlerror.cpp \
-		    $$SQL_CPP/qsqlresult.cpp \
-		    $$SQL_CPP/qsqlindex.cpp \
-		    $$SQL_CPP/qsqlpropertymap.cpp \
-		    $$SQL_CPP/qsqlmanager_p.cpp \
-		    $$SQL_CPP/qdatatable.cpp \
-		    $$SQL_CPP/qdataview.cpp \
-		    $$SQL_CPP/qdatabrowser.cpp \
-		    $$SQL_CPP/qsqlselectcursor.cpp \
-		    $$SQL_CPP/drivers/cache/qsqlcachedresult.cpp
+	SOURCES     += $$SQL_CPP/tqsqlquery.cpp \
+		    $$SQL_CPP/tqsqldatabase.cpp \
+		    $$SQL_CPP/tqsqlfield.cpp \
+		    $$SQL_CPP/tqsqlrecord.cpp \
+		    $$SQL_CPP/tqsqlform.cpp \
+		    $$SQL_CPP/tqsqlcursor.cpp \
+		    $$SQL_CPP/tqeditorfactory.cpp \
+		    $$SQL_CPP/tqsqleditorfactory.cpp \
+		    $$SQL_CPP/tqsqldriver.cpp \
+		    $$SQL_CPP/tqsqlextension_p.cpp \
+		    $$SQL_CPP/tqsqldriverplugin.cpp \
+		    $$SQL_CPP/tqsqlerror.cpp \
+		    $$SQL_CPP/tqsqlresult.cpp \
+		    $$SQL_CPP/tqsqlindex.cpp \
+		    $$SQL_CPP/tqsqlpropertymap.cpp \
+		    $$SQL_CPP/tqsqlmanager_p.cpp \
+		    $$SQL_CPP/tqdatatable.cpp \
+		    $$SQL_CPP/tqdataview.cpp \
+		    $$SQL_CPP/tqdatabrowser.cpp \
+		    $$SQL_CPP/tqsqlselectcursor.cpp \
+		    $$SQL_CPP/drivers/cache/tqsqlcachedresult.cpp
 
 	contains(sql-drivers, all ) {
 		sql-driver += psql mysql odbc oci tds db2 sqlite ibase
 	}			
 
 	contains(sql-drivers, psql) {
-		HEADERS += $$SQL_CPP/drivers/psql/qsql_psql.h
-		SOURCES += $$SQL_CPP/drivers/psql/qsql_psql.cpp
+		HEADERS += $$SQL_CPP/drivers/psql/tqsql_psql.h
+		SOURCES += $$SQL_CPP/drivers/psql/tqsql_psql.cpp
 		DEFINES += QT_SQL_POSTGRES
 		unix {
 			!contains( LIBS, .*pq.* ) {
@@ -81,8 +81,8 @@ sql {
 	}
 
 	contains(sql-drivers, mysql) {
-		HEADERS += $$SQL_CPP/drivers/mysql/qsql_mysql.h
-		SOURCES += $$SQL_CPP/drivers/mysql/qsql_mysql.cpp
+		HEADERS += $$SQL_CPP/drivers/mysql/tqsql_mysql.h
+		SOURCES += $$SQL_CPP/drivers/mysql/tqsql_mysql.cpp
 		DEFINES += QT_SQL_MYSQL
 		unix {
 			!contains( LIBS, .*mysql.* ) {
@@ -104,8 +104,8 @@ sql {
 	}
 	
 	contains(sql-drivers, odbc) {
-		HEADERS += $$SQL_CPP/drivers/odbc/qsql_odbc.h
-		SOURCES += $$SQL_CPP/drivers/odbc/qsql_odbc.cpp
+		HEADERS += $$SQL_CPP/drivers/odbc/tqsql_odbc.h
+		SOURCES += $$SQL_CPP/drivers/odbc/tqsql_odbc.cpp
 		DEFINES += QT_SQL_ODBC
 
 		mac {
@@ -128,8 +128,8 @@ sql {
 	}
 
 	contains(sql-drivers, oci) {
-		HEADERS += $$SQL_CPP/drivers/oci/qsql_oci.h
-		SOURCES += $$SQL_CPP/drivers/oci/qsql_oci.cpp
+		HEADERS += $$SQL_CPP/drivers/oci/tqsql_oci.h
+		SOURCES += $$SQL_CPP/drivers/oci/tqsql_oci.cpp
 		DEFINES += QT_SQL_OCI
 		unix {
 			!contains( LIBS, .*clnts.* ) {
@@ -149,10 +149,10 @@ sql {
 	}
 
 	contains(sql-drivers, tds) {
-		HEADERS += $$SQL_CPP/drivers/tds/qsql_tds.h \
-			   $$SQL_CPP/drivers/shared/qsql_result.h
-		SOURCES += $$SQL_CPP/drivers/tds/qsql_tds.cpp \
-			   $$SQL_CPP/drivers/shared/qsql_result.cpp
+		HEADERS += $$SQL_CPP/drivers/tds/tqsql_tds.h \
+			   $$SQL_CPP/drivers/shared/tqsql_result.h
+		SOURCES += $$SQL_CPP/drivers/tds/tqsql_tds.cpp \
+			   $$SQL_CPP/drivers/shared/tqsql_result.cpp
 		DEFINES += QT_SQL_TDS
 		unix {
 			LIBS += -L$SYBASE/lib -lsybdb
@@ -171,8 +171,8 @@ sql {
 	}
 
 	contains(sql-drivers, db2) {
-		HEADERS += $$SQL_CPP/drivers/db2/qsql_db2.h
-		SOURCES += $$SQL_CPP/drivers/db2/qsql_db2.cpp
+		HEADERS += $$SQL_CPP/drivers/db2/tqsql_db2.h
+		SOURCES += $$SQL_CPP/drivers/db2/tqsql_db2.cpp
 		DEFINES += QT_SQL_DB2
 		unix {
 			LIBS += -ldb2
@@ -184,8 +184,8 @@ sql {
 	}
 
 	contains(sql-drivers, ibase) {
-                HEADERS += $$SQL_CPP/drivers/ibase/qsql_ibase.h
-                SOURCES += $$SQL_CPP/drivers/ibase/qsql_ibase.cpp
+                HEADERS += $$SQL_CPP/drivers/ibase/tqsql_ibase.h
+                SOURCES += $$SQL_CPP/drivers/ibase/tqsql_ibase.cpp
                 DEFINES += QT_SQL_IBASE
                 unix {
                         LIBS *= -lfbclient
@@ -246,14 +246,14 @@ sql {
                 $$SQL_CPP/../3rdparty/sqlite/where.c
 	    }
 
-            HEADERS += $$SQL_CPP/drivers/sqlite/qsql_sqlite.h
-            SOURCES += $$SQL_CPP/drivers/sqlite/qsql_sqlite.cpp
+            HEADERS += $$SQL_CPP/drivers/sqlite/tqsql_sqlite.h
+            SOURCES += $$SQL_CPP/drivers/sqlite/tqsql_sqlite.cpp
             DEFINES += QT_SQL_SQLITE
         }
 
         contains(sql-drivers, sqlite3) {
-            HEADERS += $$SQL_CPP/drivers/sqlite3/qsql_sqlite3.h
-            SOURCES += $$SQL_CPP/drivers/sqlite3/qsql_sqlite3.cpp
+            HEADERS += $$SQL_CPP/drivers/sqlite3/tqsql_sqlite3.h
+            SOURCES += $$SQL_CPP/drivers/sqlite3/tqsql_sqlite3.cpp
             DEFINES += QT_SQL_SQLITE3
             unix {
                 !contains( LIBS, .*sqlite3.* ) {
diff --git a/src/sql/qdatabrowser.cpp b/src/sql/tqdatabrowser.cpp
index 1b722822c..a716d8832 100644
--- a/src/sql/qdatabrowser.cpp
+++ b/src/sql/tqdatabrowser.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "ntqdatabrowser.h"
+#include "tqdatabrowser.h"
 
 #ifndef TQT_NO_SQL_VIEW_WIDGETS
 
-#include "ntqsqlform.h"
-#include "qsqlmanager_p.h"
-#include "ntqsqlresult.h"
+#include "tqsqlform.h"
+#include "tqsqlmanager_p.h"
+#include "tqsqlresult.h"
 
 class TQDataBrowserPrivate
 {
@@ -58,7 +58,7 @@ public:
 };
 
 /*!
-    \class TQDataBrowser ntqdatabrowser.h
+    \class TQDataBrowser tqdatabrowser.h
     \brief The TQDataBrowser class provides data manipulation and
     navigation for data entry forms.
 
diff --git a/src/sql/ntqdatabrowser.h b/src/sql/tqdatabrowser.h
index 6dc3aab3b..d4b9ac290 100644
--- a/src/sql/ntqdatabrowser.h
+++ b/src/sql/tqdatabrowser.h
@@ -45,10 +45,10 @@
 #include "ntqwidget.h"
 #include "ntqstring.h"
 #include "ntqstringlist.h"
-#include "ntqsql.h"
-#include "ntqsqlindex.h"
-#include "ntqsqlcursor.h"
-#include "ntqsqlerror.h"
+#include "tqsql.h"
+#include "tqsqlindex.h"
+#include "tqsqlcursor.h"
+#include "tqsqlerror.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SQL_VIEW_WIDGETS
diff --git a/src/sql/qdatatable.cpp b/src/sql/tqdatatable.cpp
index 62abd2d45..9d8468c06 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/tqdatatable.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "ntqdatatable.h"
+#include "tqdatatable.h"
 
 #ifndef TQT_NO_SQL_VIEW_WIDGETS
 
-#include "ntqsqldriver.h"
-#include "ntqsqleditorfactory.h"
-#include "ntqsqlpropertymap.h"
+#include "tqsqldriver.h"
+#include "tqsqleditorfactory.h"
+#include "tqsqlpropertymap.h"
 #include "ntqapplication.h"
 #include "ntqlayout.h"
 #include "ntqpainter.h"
 #include "ntqpopupmenu.h"
 #include "ntqvaluelist.h"
-#include "qsqlmanager_p.h"
+#include "tqsqlmanager_p.h"
 #include "ntqdatetime.h"
 #include "ntqcursor.h"
 #include "ntqtimer.h"
@@ -132,7 +132,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor )
 
 
 /*!
-    \class TQDataTable ntqdatatable.h
+    \class TQDataTable tqdatatable.h
     \brief The TQDataTable class provides a flexible SQL table widget that supports browsing and editing.
 
     \ingroup database
diff --git a/src/sql/ntqdatatable.h b/src/sql/tqdatatable.h
index d854c456d..e0cbb2658 100644
--- a/src/sql/ntqdatatable.h
+++ b/src/sql/tqdatatable.h
@@ -45,10 +45,10 @@
 #include "ntqstring.h"
 #include "ntqvariant.h"
 #include "ntqtable.h"
-#include "ntqsql.h"
-#include "ntqsqlcursor.h"
-#include "ntqsqlindex.h"
-#include "ntqsqleditorfactory.h"
+#include "tqsql.h"
+#include "tqsqlcursor.h"
+#include "tqsqlindex.h"
+#include "tqsqleditorfactory.h"
 #include "ntqiconset.h"
 #endif // QT_H
 
diff --git a/src/sql/qdataview.cpp b/src/sql/tqdataview.cpp
index 177aa6419..a8a197f01 100644
--- a/src/sql/qdataview.cpp
+++ b/src/sql/tqdataview.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqdataview.h"
+#include "tqdataview.h"
 
 #ifndef TQT_NO_SQL_VIEW_WIDGETS
 
-#include "qsqlmanager_p.h"
+#include "tqsqlmanager_p.h"
 
 class TQDataViewPrivate
 {
@@ -53,7 +53,7 @@ public:
 
 
 /*!
-    \class TQDataView ntqdataview.h
+    \class TQDataView tqdataview.h
     \brief The TQDataView class provides read-only SQL forms.
 
     \ingroup database
diff --git a/src/sql/ntqdataview.h b/src/sql/tqdataview.h
index 245bb5eab..245bb5eab 100644
--- a/src/sql/ntqdataview.h
+++ b/src/sql/tqdataview.h
diff --git a/src/sql/qeditorfactory.cpp b/src/sql/tqeditorfactory.cpp
index bc9d2605a..918f5f32f 100644
--- a/src/sql/qeditorfactory.cpp
+++ b/src/sql/tqeditorfactory.cpp
@@ -44,13 +44,13 @@
 #include "ntqspinbox.h"
 #include "ntqcombobox.h"
 
-#include "ntqeditorfactory.h"
+#include "tqeditorfactory.h"
 #include "ntqdatetimeedit.h"
 
 #ifndef TQT_NO_SQL_EDIT_WIDGETS
 
 /*!
-    \class TQEditorFactory ntqeditorfactory.h
+    \class TQEditorFactory tqeditorfactory.h
     \brief The TQEditorFactory class is used to create editor widgets
     for TQVariant data types.
 
diff --git a/src/sql/ntqeditorfactory.h b/src/sql/tqeditorfactory.h
index cea5885ac..cea5885ac 100644
--- a/src/sql/ntqeditorfactory.h
+++ b/src/sql/tqeditorfactory.h
diff --git a/src/sql/qsql.cpp b/src/sql/tqsql.cpp
index 74ea4bd4c..ab497c6ed 100644
--- a/src/sql/qsql.cpp
+++ b/src/sql/tqsql.cpp
@@ -40,7 +40,7 @@
 
 
 /*!
-    \class TQSql ntqsql.h
+    \class TQSql tqsql.h
     \brief The TQSql class is a namespace for TQt SQL identifiers that
     need to be global-like.
 
diff --git a/src/sql/ntqsql.h b/src/sql/tqsql.h
index 28a8204b2..28a8204b2 100644
--- a/src/sql/ntqsql.h
+++ b/src/sql/tqsql.h
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/tqsqlcursor.cpp
index ed1613d57..858a3668a 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/tqsqlcursor.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "ntqsqlcursor.h"
+#include "tqsqlcursor.h"
 
 #ifndef TQT_NO_SQL
 
-#include "ntqsqldriver.h"
-#include "ntqsqlresult.h"
+#include "tqsqldriver.h"
+#include "tqsqlresult.h"
 #include "ntqdatetime.h"
-#include "ntqsqldatabase.h"
-#include "ntqsql.h"
+#include "tqsqldatabase.h"
+#include "tqsql.h"
 
 class TQSqlCursorPrivate
 {
@@ -124,7 +124,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
 }
 
 /*!
-    \class TQSqlCursor ntqsqlcursor.h
+    \class TQSqlCursor tqsqlcursor.h
     \brief The TQSqlCursor class provides browsing and editing of SQL
     tables and views.
 
diff --git a/src/sql/ntqsqlcursor.h b/src/sql/tqsqlcursor.h
index e253324af..f9eaa3bdf 100644
--- a/src/sql/ntqsqlcursor.h
+++ b/src/sql/tqsqlcursor.h
@@ -42,10 +42,10 @@
 #define TQSQLCURSOR_H
 
 #ifndef QT_H
-#include "ntqsqlrecord.h"
+#include "tqsqlrecord.h"
 #include "ntqstringlist.h"
-#include "ntqsqlquery.h"
-#include "ntqsqlindex.h"
+#include "tqsqlquery.h"
+#include "tqsqlindex.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/tqsqldatabase.cpp
index e21af1d36..d198e3cba 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/tqsqldatabase.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsqldatabase.h"
+#include "tqsqldatabase.h"
 
 #ifndef TQT_NO_SQL
 
@@ -48,39 +48,39 @@
 #endif
 
 #ifdef QT_SQL_POSTGRES
-#include "drivers/psql/qsql_psql.h"
+#include "drivers/psql/tqsql_psql.h"
 #endif
 #ifdef QT_SQL_MYSQL
-#include "drivers/mysql/qsql_mysql.h"
+#include "drivers/mysql/tqsql_mysql.h"
 #endif
 #ifdef QT_SQL_ODBC
-#include "drivers/odbc/qsql_odbc.h"
+#include "drivers/odbc/tqsql_odbc.h"
 #endif
 #ifdef QT_SQL_OCI
-#include "drivers/oci/qsql_oci.h"
+#include "drivers/oci/tqsql_oci.h"
 #endif
 #ifdef QT_SQL_TDS
-#include "drivers/tds/qsql_tds.h"
+#include "drivers/tds/tqsql_tds.h"
 #endif
 #ifdef QT_SQL_DB2
-#include "drivers/db2/qsql_db2.h"
+#include "drivers/db2/tqsql_db2.h"
 #endif
 #ifdef QT_SQL_SQLITE
-#include "drivers/sqlite/qsql_sqlite.h"
+#include "drivers/sqlite/tqsql_sqlite.h"
 #endif
 #ifdef QT_SQL_SQLITE3
-#include "drivers/sqlite3/qsql_sqlite3.h"
+#include "drivers/sqlite3/tqsql_sqlite3.h"
 #endif
 #ifdef QT_SQL_IBASE
-#include "drivers/ibase/qsql_ibase.h"
+#include "drivers/ibase/tqsql_ibase.h"
 #endif
 
 #include "ntqapplication.h"
-#include "ntqsqlresult.h"
-#include "ntqsqldriver.h"
-#include "qsqldriverinterface_p.h"
+#include "tqsqlresult.h"
+#include "tqsqldriver.h"
+#include "tqsqldriverinterface_p.h"
 #include <private/qpluginmanager_p.h>
-#include <private/qsqlextension_p.h>
+#include <private/tqsqlextension_p.h>
 #include "tqobject.h"
 #include "ntqguardedptr.h"
 #include "ntqcleanuphandler.h"
@@ -366,7 +366,7 @@ public:
 };
 
 /*!
-    \class TQSqlDatabase ntqsqldatabase.h
+    \class TQSqlDatabase tqsqldatabase.h
     \brief The TQSqlDatabase class is used to create SQL database
     connections and to provide transaction handling.
 
@@ -1256,7 +1256,7 @@ bool TQSqlDatabase::isDriverAvailable( const TQString& name )
     following way:
 
     \code
-    #include "qtdir/src/sql/drivers/psql/qsql_psql.cpp"
+    #include "qtdir/src/sql/drivers/psql/tqsql_psql.cpp"
     \endcode
     (We assume that \c qtdir is the directory where TQt is installed.)
     This will pull in the code that is needed to use the PostgreSQL
@@ -1302,42 +1302,42 @@ bool TQSqlDatabase::isDriverAvailable( const TQString& name )
     \i TQPSQL7
     \i TQPSQLDriver
     \i PGconn* connection
-    \i \c qsql_psql.cpp
+    \i \c tqsql_psql.cpp
     \row
     \i TQMYSQL3
     \i TQMYSQLDriver
     \i MYSQL* connection
-    \i \c qsql_mysql.cpp
+    \i \c tqsql_mysql.cpp
     \row
     \i TQOCI8
     \i TQOCIDriver
     \i OCIEnv* environment, OCIError* error, OCISvcCtx* serviceContext
-    \i \c qsql_oci.cpp
+    \i \c tqsql_oci.cpp
     \row
     \i TQODBC3
     \i TQODBCDriver
     \i SQLHANDLE environment, SQLHANDLE connection
-    \i \c qsql_odbc.cpp
+    \i \c tqsql_odbc.cpp
     \row
     \i TQDB2
     \i TQDB2
     \i SQLHANDLE environment, SQLHANDLE connection
-    \i \c qsql_db2.cpp
+    \i \c tqsql_db2.cpp
     \row
     \i TQTDS7
     \i TQTDSDriver
     \i LOGINREC* loginRecord, DBPROCESS* dbProcess, const TQString& hostName
-    \i \c qsql_tds.cpp
+    \i \c tqsql_tds.cpp
     \row
     \i TQSQLITE
     \i TQSQLiteDriver
     \i sqlite* connection
-    \i \c qsql_sqlite.cpp
+    \i \c tqsql_sqlite.cpp
     \row
     \i TQIBASE
     \i TQIBaseDriver
     \i isc_db_handle connection
-    \i \c qsql_ibase.cpp
+    \i \c tqsql_ibase.cpp
     \endtable
 
     Note: The host name (or service name) is needed when constructing
diff --git a/src/sql/ntqsqldatabase.h b/src/sql/tqsqldatabase.h
index c50955e82..fd5a291de 100644
--- a/src/sql/ntqsqldatabase.h
+++ b/src/sql/tqsqldatabase.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "ntqstring.h"
-#include "ntqsqlquery.h"
+#include "tqsqlquery.h"
 #include "ntqstringlist.h"
 #endif // QT_H
 
diff --git a/src/sql/qsqldriver.cpp b/src/sql/tqsqldriver.cpp
index b00f76c7b..f24fedf47 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/tqsqldriver.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqsqldriver.h"
+#include "tqsqldriver.h"
 
 #ifndef TQT_NO_SQL
 
 #include "ntqdatetime.h"
-#include "qsqlextension_p.h"
+#include "tqsqlextension_p.h"
 
 // database states
 #define DBState_Open		0x0001
@@ -54,7 +54,7 @@ TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict();
 TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict();
 
 /*!
-    \class TQSqlDriver ntqsqldriver.h
+    \class TQSqlDriver tqsqldriver.h
     \brief The TQSqlDriver class is an abstract base class for accessing
     SQL databases.
 
diff --git a/src/sql/ntqsqldriver.h b/src/sql/tqsqldriver.h
index ce900b72a..08a6f43de 100644
--- a/src/sql/ntqsqldriver.h
+++ b/src/sql/tqsqldriver.h
@@ -45,10 +45,10 @@
 #include "tqobject.h"
 #include "ntqptrdict.h"
 #include "ntqstring.h"
-#include "ntqsqlerror.h"
-#include "ntqsqlquery.h"
-#include "ntqsqlfield.h"
-#include "ntqsqlindex.h"
+#include "tqsqlerror.h"
+#include "tqsqlquery.h"
+#include "tqsqlfield.h"
+#include "tqsqlindex.h"
 #include "ntqstringlist.h"
 #include "ntqmap.h"
 #endif // QT_H
diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/tqsqldriverinterface_p.h
index 851770366..851770366 100644
--- a/src/sql/qsqldriverinterface_p.h
+++ b/src/sql/tqsqldriverinterface_p.h
diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/tqsqldriverplugin.cpp
index f0c2f39f8..9d0bb7090 100644
--- a/src/sql/qsqldriverplugin.cpp
+++ b/src/sql/tqsqldriverplugin.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "ntqsqldriverplugin.h"
+#include "tqsqldriverplugin.h"
 
 #ifndef TQT_NO_SQL
 #ifndef TQT_NO_COMPONENT
 
-#include "qsqldriverinterface_p.h"
+#include "tqsqldriverinterface_p.h"
 
 /*!
-    \class TQSqlDriverPlugin ntqsqldriverplugin.h
+    \class TQSqlDriverPlugin tqsqldriverplugin.h
     \brief The TQSqlDriverPlugin class provides an abstract base for custom TQSqlDriver plugins.
 
     \ingroup plugins
diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/tqsqldriverplugin.h
index 97e7addb3..97e7addb3 100644
--- a/src/sql/ntqsqldriverplugin.h
+++ b/src/sql/tqsqldriverplugin.h
diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/tqsqleditorfactory.cpp
index b831cae50..f7ac2d9e8 100644
--- a/src/sql/qsqleditorfactory.cpp
+++ b/src/sql/tqsqleditorfactory.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqsqleditorfactory.h"
+#include "tqsqleditorfactory.h"
 
 #ifndef TQT_NO_SQL_EDIT_WIDGETS
 
-#include "ntqsqlfield.h"
+#include "tqsqlfield.h"
 #include "ntqcleanuphandler.h"
 #include "ntqlabel.h"
 #include "ntqlineedit.h"
@@ -51,7 +51,7 @@
 #include "ntqdatetimeedit.h"
 
 /*!
-    \class TQSqlEditorFactory ntqsqleditorfactory.h
+    \class TQSqlEditorFactory tqsqleditorfactory.h
     \brief The TQSqlEditorFactory class is used to create the editors
     used by TQDataTable and TQSqlForm.
 
@@ -93,7 +93,7 @@ TQSqlEditorFactory::~TQSqlEditorFactory()
 }
 
 static TQSqlEditorFactory * defaultfactory = 0;
-static TQCleanupHandler< TQSqlEditorFactory > qsql_cleanup_editor_factory;
+static TQCleanupHandler< TQSqlEditorFactory > tqsql_cleanup_editor_factory;
 
 /*!
     Returns an instance of a default editor factory.
@@ -103,7 +103,7 @@ TQSqlEditorFactory * TQSqlEditorFactory::defaultFactory()
 {
     if( defaultfactory == 0 ){
 	defaultfactory = new TQSqlEditorFactory();
-	qsql_cleanup_editor_factory.add( &defaultfactory );
+	tqsql_cleanup_editor_factory.add( &defaultfactory );
     }
 
     return defaultfactory;
@@ -121,11 +121,11 @@ void TQSqlEditorFactory::installDefaultFactory( TQSqlEditorFactory * factory )
     if( factory == 0 ) return;
 
     if( defaultfactory != 0 ){
-	qsql_cleanup_editor_factory.remove( &defaultfactory );
+	tqsql_cleanup_editor_factory.remove( &defaultfactory );
 	delete defaultfactory;
     }
     defaultfactory = factory;
-    qsql_cleanup_editor_factory.add( &defaultfactory );
+    tqsql_cleanup_editor_factory.add( &defaultfactory );
 }
 
 /*!
diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/tqsqleditorfactory.h
index 667ad8651..f80eb47fd 100644
--- a/src/sql/ntqsqleditorfactory.h
+++ b/src/sql/tqsqleditorfactory.h
@@ -42,7 +42,7 @@
 #define TQSQLEDITORFACTORY_H
 
 #ifndef QT_H
-#include "ntqeditorfactory.h"
+#include "tqeditorfactory.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlerror.cpp b/src/sql/tqsqlerror.cpp
index 5ae1be7bc..1b9f69ca8 100644
--- a/src/sql/qsqlerror.cpp
+++ b/src/sql/tqsqlerror.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "ntqsqlerror.h"
+#include "tqsqlerror.h"
 #include <ntqmessagebox.h>
 
 #ifndef TQT_NO_SQL
 
 /*!
-    \class TQSqlError ntqsqlerror.h
+    \class TQSqlError tqsqlerror.h
     \brief The TQSqlError class provides SQL database error information.
 
     \ingroup database
diff --git a/src/sql/ntqsqlerror.h b/src/sql/tqsqlerror.h
index 2d60c2f21..2d60c2f21 100644
--- a/src/sql/ntqsqlerror.h
+++ b/src/sql/tqsqlerror.h
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/tqsqlextension_p.cpp
index 1ce7b23f4..6ad4251c3 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/tqsqlextension_p.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qsqlextension_p.h"
+#include "tqsqlextension_p.h"
 
 #ifndef TQT_NO_SQL
 TQSqlExtension::TQSqlExtension()
diff --git a/src/sql/qsqlextension_p.h b/src/sql/tqsqlextension_p.h
index ff2580635..c4ea2850c 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/tqsqlextension_p.h
@@ -58,7 +58,7 @@
 #include "ntqvaluevector.h"
 #include "ntqstring.h"
 #include "ntqvariant.h"
-#include "ntqsql.h"
+#include "tqsql.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SQL
diff --git a/src/sql/qsqlfield.cpp b/src/sql/tqsqlfield.cpp
index 17d2f7608..7a99de333 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/tqsqlfield.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "ntqsqlfield.h"
+#include "tqsqlfield.h"
 
 #ifndef TQT_NO_SQL
 
 
 /*!
-    \class TQSqlField ntqsqlfield.h
+    \class TQSqlField tqsqlfield.h
     \brief The TQSqlField class manipulates the fields in SQL database tables
     and views.
 
@@ -306,7 +306,7 @@ struct TQSqlFieldInfoPrivate
 };
 
 /*!
-    \class TQSqlFieldInfo ntqsqlfield.h
+    \class TQSqlFieldInfo tqsqlfield.h
     \brief The TQSqlFieldInfo class stores meta data associated with a SQL field.
 
     \ingroup database
diff --git a/src/sql/ntqsqlfield.h b/src/sql/tqsqlfield.h
index a9d5e8947..a9d5e8947 100644
--- a/src/sql/ntqsqlfield.h
+++ b/src/sql/tqsqlfield.h
diff --git a/src/sql/qsqlform.cpp b/src/sql/tqsqlform.cpp
index 7ebb79f28..2d72d707b 100644
--- a/src/sql/qsqlform.cpp
+++ b/src/sql/tqsqlform.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "ntqsqlform.h"
+#include "tqsqlform.h"
 
 #ifndef TQT_NO_SQL_FORM
 
-#include "ntqsqlfield.h"
-#include "ntqsqlpropertymap.h"
-#include "ntqsqlrecord.h"
+#include "tqsqlfield.h"
+#include "tqsqlpropertymap.h"
+#include "tqsqlrecord.h"
 #include "ntqstringlist.h"
 #include "ntqwidget.h"
 #include "ntqdict.h"
diff --git a/src/sql/ntqsqlform.h b/src/sql/tqsqlform.h
index 7771f7b70..7771f7b70 100644
--- a/src/sql/ntqsqlform.h
+++ b/src/sql/tqsqlform.h
diff --git a/src/sql/qsqlindex.cpp b/src/sql/tqsqlindex.cpp
index c916f82f6..0a8a8f5b5 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/tqsqlindex.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqsqlindex.h"
+#include "tqsqlindex.h"
 
 #ifndef TQT_NO_SQL
 
-#include "ntqsqlcursor.h"
+#include "tqsqlcursor.h"
 
 /*!
-    \class TQSqlIndex ntqsqlindex.h
+    \class TQSqlIndex tqsqlindex.h
     \brief The TQSqlIndex class provides functions to manipulate and
     describe TQSqlCursor and TQSqlDatabase indexes.
 
diff --git a/src/sql/ntqsqlindex.h b/src/sql/tqsqlindex.h
index aa0ad102b..ef860b735 100644
--- a/src/sql/ntqsqlindex.h
+++ b/src/sql/tqsqlindex.h
@@ -44,8 +44,8 @@
 #ifndef QT_H
 #include "ntqstring.h"
 #include "ntqstringlist.h"
-#include "ntqsqlfield.h"
-#include "ntqsqlrecord.h"
+#include "tqsqlfield.h"
+#include "tqsqlrecord.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp
index 3cf91b802..cd8ca467e 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/tqsqlmanager_p.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qsqlmanager_p.h"
+#include "tqsqlmanager_p.h"
 
 #ifndef TQT_NO_SQL
 
 #include "ntqapplication.h"
 #include "ntqwidget.h"
-#include "ntqsqlcursor.h"
-#include "ntqsqlform.h"
-#include "ntqsqldriver.h"
+#include "tqsqlcursor.h"
+#include "tqsqlform.h"
+#include "tqsqldriver.h"
 #include "ntqstring.h"
 #include "ntqmessagebox.h"
 #include "ntqbitarray.h"
@@ -67,7 +67,7 @@ public:
 };
 
 /*!
-  \class TQSqlCursorManager qsqlmanager_p.h
+  \class TQSqlCursorManager tqsqlmanager_p.h
   \brief The TQSqlCursorManager class manages a database cursor.
 
   \module sql
@@ -630,7 +630,7 @@ public:
 };
 
 /*!
-  \class TQDataManager qsqlmanager_p.h
+  \class TQDataManager tqsqlmanager_p.h
     \ingroup database
 
   \brief The TQDataManager class is an internal class for implementing
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/tqsqlmanager_p.h
index c919b9df6..2a81115b6 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/tqsqlmanager_p.h
@@ -57,10 +57,10 @@
 #include "ntqglobal.h"
 #include "ntqstring.h"
 #include "ntqstringlist.h"
-#include "ntqsql.h"
-#include "ntqsqlerror.h"
-#include "ntqsqlindex.h"
-#include "ntqsqlcursor.h"
+#include "tqsql.h"
+#include "tqsqlerror.h"
+#include "tqsqlindex.h"
+#include "tqsqlcursor.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/tqsqlpropertymap.cpp
index c50368190..1f982e9c2 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/tqsqlpropertymap.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsqlpropertymap.h"
+#include "tqsqlpropertymap.h"
 
 #ifndef TQT_NO_SQL_FORM
 
@@ -55,7 +55,7 @@ public:
 };
 
 /*!
-    \class TQSqlPropertyMap ntqsqlpropertymap.h
+    \class TQSqlPropertyMap tqsqlpropertymap.h
     \brief The TQSqlPropertyMap class is used to map widgets to SQL fields.
 
     \ingroup database
@@ -268,7 +268,7 @@ void TQSqlPropertyMap::remove( const TQString & classname )
 }
 
 static TQSqlPropertyMap * defaultmap = 0;
-static TQCleanupHandler< TQSqlPropertyMap > qsql_cleanup_property_map;
+static TQCleanupHandler< TQSqlPropertyMap > tqsql_cleanup_property_map;
 
 /*!
     Returns the application global TQSqlPropertyMap.
@@ -277,7 +277,7 @@ TQSqlPropertyMap * TQSqlPropertyMap::defaultMap()
 {
     if( defaultmap == 0 ){
 	defaultmap = new TQSqlPropertyMap();
-	qsql_cleanup_property_map.add( &defaultmap );
+	tqsql_cleanup_property_map.add( &defaultmap );
     }
     return defaultmap;
 }
@@ -294,11 +294,11 @@ void TQSqlPropertyMap::installDefaultMap( TQSqlPropertyMap * map )
     if( map == 0 ) return;
 
     if( defaultmap != 0 ){
-	qsql_cleanup_property_map.remove( &defaultmap );
+	tqsql_cleanup_property_map.remove( &defaultmap );
 	delete defaultmap;
     }
     defaultmap = map;
-    qsql_cleanup_property_map.add( &defaultmap );
+    tqsql_cleanup_property_map.add( &defaultmap );
 }
 
 #endif // TQT_NO_SQL_FORM
diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/tqsqlpropertymap.h
index c7bff6eb7..c7bff6eb7 100644
--- a/src/sql/ntqsqlpropertymap.h
+++ b/src/sql/tqsqlpropertymap.h
diff --git a/src/sql/qsqlquery.cpp b/src/sql/tqsqlquery.cpp
index b1a25502b..1411912db 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/tqsqlquery.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "ntqsqlquery.h"
+#include "tqsqlquery.h"
 
 #ifndef TQT_NO_SQL
 
 //#define QT_DEBUG_SQL
 
-#include "ntqsqlresult.h"
-#include "ntqsqldriver.h"
-#include "ntqsqldatabase.h"
-#include "ntqsql.h"
+#include "tqsqlresult.h"
+#include "tqsqldriver.h"
+#include "tqsqldatabase.h"
+#include "tqsql.h"
 #include "ntqregexp.h"
-#include "private/qsqlextension_p.h"
+#include "private/tqsqlextension_p.h"
 
 
 /*!
@@ -81,7 +81,7 @@ void TQSqlResultShared::slotResultDestroyed()
 }
 
 /*!
-    \class TQSqlQuery ntqsqlquery.h
+    \class TQSqlQuery tqsqlquery.h
     \brief The TQSqlQuery class provides a means of executing and
     manipulating SQL statements.
 
diff --git a/src/sql/ntqsqlquery.h b/src/sql/tqsqlquery.h
index 62df18531..eea5eea72 100644
--- a/src/sql/ntqsqlquery.h
+++ b/src/sql/tqsqlquery.h
@@ -46,9 +46,9 @@
 #include "ntqstring.h"
 #include "ntqvariant.h"
 #include "ntqvaluelist.h"
-#include "ntqsqlerror.h"
-#include "ntqsqlfield.h"
-#include "ntqsql.h"
+#include "tqsqlerror.h"
+#include "tqsqlfield.h"
+#include "tqsql.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SQL
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/tqsqlrecord.cpp
index 3d7878e58..b12541f8b 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/tqsqlrecord.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsqlrecord.h"
+#include "tqsqlrecord.h"
 
 #ifndef TQT_NO_SQL
 
@@ -153,7 +153,7 @@ TQSqlRecordShared::~TQSqlRecordShared()
 }
 
 /*!
-    \class TQSqlRecord ntqsqlfield.h
+    \class TQSqlRecord tqsqlfield.h
     \brief The TQSqlRecord class encapsulates a database record, i.e. a
     set of database fields.
 
@@ -688,7 +688,7 @@ void TQSqlRecord::setValue( const TQString& name, const TQVariant& val )
 /******************************************/
 
 /*!
-    \class TQSqlRecordInfo ntqsqlrecord.h
+    \class TQSqlRecordInfo tqsqlrecord.h
     \brief The TQSqlRecordInfo class encapsulates a set of database field meta data.
 
     \ingroup database
diff --git a/src/sql/ntqsqlrecord.h b/src/sql/tqsqlrecord.h
index 9b4e1e9e8..5f141abfe 100644
--- a/src/sql/ntqsqlrecord.h
+++ b/src/sql/tqsqlrecord.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #include "ntqstringlist.h"
 #include "ntqvariant.h"
-#include "ntqsqlfield.h"
+#include "tqsqlfield.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SQL
diff --git a/src/sql/qsqlresult.cpp b/src/sql/tqsqlresult.cpp
index d005803cf..05559290e 100644
--- a/src/sql/qsqlresult.cpp
+++ b/src/sql/tqsqlresult.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "ntqsqlresult.h"
-#include "private/qsqlextension_p.h"
+#include "tqsqlresult.h"
+#include "private/tqsqlextension_p.h"
 
 #ifndef TQT_NO_SQL
 
diff --git a/src/sql/ntqsqlresult.h b/src/sql/tqsqlresult.h
index 0b0763498..0075ed3fe 100644
--- a/src/sql/ntqsqlresult.h
+++ b/src/sql/tqsqlresult.h
@@ -44,9 +44,9 @@
 #ifndef QT_H
 #include "ntqstring.h"
 #include "ntqvariant.h"
-#include "ntqsqlerror.h"
-#include "ntqsqlfield.h"
-#include "ntqsql.h"
+#include "tqsqlerror.h"
+#include "tqsqlfield.h"
+#include "tqsql.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/tqsqlselectcursor.cpp
index 23f65c91d..77d0548ce 100644
--- a/src/sql/qsqlselectcursor.cpp
+++ b/src/sql/tqsqlselectcursor.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "ntqsqlselectcursor.h"
-#include "ntqsqldriver.h"
+#include "tqsqlselectcursor.h"
+#include "tqsqldriver.h"
 
 #ifndef TQT_NO_SQL
 
@@ -52,7 +52,7 @@ public:
 };
 
 /*!
-    \class TQSqlSelectCursor ntqsqlselectcursor.h
+    \class TQSqlSelectCursor tqsqlselectcursor.h
     \brief The TQSqlSelectCursor class provides browsing of general SQL
     SELECT statements.
 
diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/tqsqlselectcursor.h
index b1f0802b0..13069ee6a 100644
--- a/src/sql/ntqsqlselectcursor.h
+++ b/src/sql/tqsqlselectcursor.h
@@ -42,7 +42,7 @@
 #define TQSQLSELECTCURSOR_H
 
 #ifndef QT_H
-#include "ntqsqlcursor.h"
+#include "tqsqlcursor.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 31fa8e25d..84bb09e4d 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -61,7 +61,7 @@
 #include <ntqevent.h>
 #include <ntqlistbox.h>
 #include <ntqstyle.h>
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
 #include <ntqvalidator.h>
 
 #include <stdlib.h>
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index a8f051d33..29d99a228 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -212,7 +212,7 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte
 //Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQTable>;
 #endif
 
-// qsqlextension template exports
+// tqsqlextension template exports
 #if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES)
 #define Q_EXPORTED_QSQLEXTENSION_TEMPLATES
 TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQMap<TQString,TQSqlParam>;
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 1b57b79de..f8e5a069c 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -56,7 +56,7 @@ SeeAlso: ???
 Feature: SQL_FORM
 Section: Database
 Requires: SQL PROPERTIES
-Name: QSqlForm
+Name: TQSqlForm
 SeeAlso: ???
 
 Feature: SQL_EDIT_WIDGETS
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 9fae544ac..8abccb8b8 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -10,8 +10,8 @@
 #include <ntqsignalslotimp.h>
 #include <ntqwidget.h>
 #include <ntqhttp.h>
-#include <private/qsqlextension_p.h>
-#include <ntqsqlindex.h>
+#include <private/tqsqlextension_p.h>
+#include <tqsqlindex.h>
 #include <ntqtable.h>
 #include <ntqtable.h>
 #include <ntqtable.h>