15 files changed, 40 insertions, 40 deletions
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;