12 files changed, 41 insertions, 41 deletions
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp
index 4c841e5f1..4f60fa252 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/qsqlcachedresult.cpp
@@ -38,7 +38,7 @@
 **********************************************************************/
 
 #include "qsqlcachedresult.h"
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 
 #ifndef QT_NO_SQL
 static const uint initial_cache_size = 128;
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index 6d78f39de..bde3457d1 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -51,11 +51,11 @@
 //
 //
 
-#include <qglobal.h>
-#include <qvariant.h>
-#include <qptrvector.h>
-#include <qvaluevector.h>
-#include <qsqlresult.h>
+#include <ntqglobal.h>
+#include <ntqvariant.h>
+#include <ntqptrvector.h>
+#include <ntqvaluevector.h>
+#include <ntqsqlresult.h>
 
 #if !defined( QT_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/qsql_ibase.cpp
index 22c41064d..f6aff5dbb 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -14,7 +14,7 @@
 
 #include "qsql_ibase.h"
 
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #include <private/qsqlextension_p.h>
 
 #include <ibase.h>
diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h
index fcb738513..45cb4b86b 100644
--- a/src/sql/drivers/ibase/qsql_ibase.h
+++ b/src/sql/drivers/ibase/qsql_ibase.h
@@ -41,8 +41,8 @@
 #ifndef TQSQL_IBASE_H
 #define TQSQL_IBASE_H
 
-#include "qsqlresult.h"
-#include "qsqldriver.h"
+#include "ntqsqlresult.h"
+#include "ntqsqldriver.h"
 #include "../cache/qsqlcachedresult.h"
 
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 10448414e..433e8de26 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -41,9 +41,9 @@
 #include "qsql_mysql.h"
 #include <private/qsqlextension_p.h>
 
-#include <qdatetime.h>
-#include <qvaluevector.h>
-#include <qsqlrecord.h>
+#include <ntqdatetime.h>
+#include <ntqvaluevector.h>
+#include <ntqsqlrecord.h>
 
 #define TQMYSQL_DRIVER_NAME "TQMYSQL3"
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h
index 4d4c7b1e5..6b1daef3a 100644
--- a/src/sql/drivers/mysql/qsql_mysql.h
+++ b/src/sql/drivers/mysql/qsql_mysql.h
@@ -41,10 +41,10 @@
 #ifndef TQSQL_MYSQL_H
 #define TQSQL_MYSQL_H
 
-#include <qsqldriver.h>
-#include <qsqlresult.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlfield.h>
+#include <ntqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 9851e1cb1..b91bea329 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -39,13 +39,13 @@
 **********************************************************************/
 
 #include "qsql_odbc.h"
-#include <qsqlrecord.h>
+#include <ntqsqlrecord.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 #endif
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #include <private/qsqlextension_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/qsql_odbc.h
index 8583dced4..0ce01703a 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -41,12 +41,12 @@
 #ifndef TQSQL_ODBC_H
 #define TQSQL_ODBC_H
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qsqldriver.h>
-#include <qsqlfield.h>
-#include <qsqlresult.h>
-#include <qsqlindex.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlfield.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 #include <qt_windows.h>
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 788a69358..b039a2474 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -43,10 +43,10 @@
 
 #include <math.h>
 
-#include <qpointarray.h>
-#include <qsqlrecord.h>
-#include <qregexp.h>
-#include <qdatetime.h>
+#include <ntqpointarray.h>
+#include <ntqsqlrecord.h>
+#include <ntqregexp.h>
+#include <ntqdatetime.h>
 // PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG.
 #if defined(DEBUG)
 # undef DEBUG
diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h
index bed3ebbc9..dd1ddc71c 100644
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
@@ -41,9 +41,9 @@
 #ifndef TQSQL_PSQL_H
 #define TQSQL_PSQL_H
 
-#include <qsqlresult.h>
-#include <qsqlfield.h>
-#include <qsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlfield.h>
+#include <ntqsqldriver.h>
 #include <libpq-fe.h>
 
 #ifdef QT_PLUGIN
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index ecdda1c0c..1662a6e8c 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -14,18 +14,18 @@
 
 #include "qsql_sqlite.h"
 
-#include <qdatetime.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <ntqdatetime.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
 
 #if (QT_VERSION-0 < 0x030000)
-#  include <qvector.h>
+#  include <ntqvector.h>
 #  if !defined Q_WS_WIN32
 #    include <unistd.h>
 #  endif
 #  include "../../../3rdparty/libraries/sqlite/sqlite.h"
 #else
-#  include <qptrvector.h>
+#  include <ntqptrvector.h>
 #  if !defined Q_WS_WIN32
 #    include <unistd.h>
 #  endif
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h
index ccde9b865..300642ce1 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite.h
@@ -15,10 +15,10 @@
 #ifndef TQSQL_SQLITE_H
 #define TQSQL_SQLITE_H
 
-#include <qsqldriver.h>
-#include <qsqlresult.h>
-#include <qsqlrecord.h>
-#include <qsqlindex.h>
+#include <ntqsqldriver.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlrecord.h>
+#include <ntqsqlindex.h>
 #include "../cache/qsqlcachedresult.h"
 
 #if (QT_VERSION-0 >= 0x030000)