12 files changed, 24 insertions, 24 deletions
diff --git a/plugins/src/sqldrivers/ibase/ibase.pro b/plugins/src/sqldrivers/ibase/ibase.pro
index 942d8abc7..ec176dfba 100644
--- a/plugins/src/sqldrivers/ibase/ibase.pro
+++ b/plugins/src/sqldrivers/ibase/ibase.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlibase
 CONFIG	+= qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/ibase/qsql_ibase.h
+HEADERS		= ../../../../src/sql/drivers/ibase/tqsql_ibase.h
 SOURCES		= main.cpp \
-		  ../../../../src/sql/drivers/ibase/qsql_ibase.cpp
+		  ../../../../src/sql/drivers/ibase/tqsql_ibase.cpp
 
 unix {
 	OBJECTS_DIR = .obj
diff --git a/plugins/src/sqldrivers/ibase/main.cpp b/plugins/src/sqldrivers/ibase/main.cpp
index 98fccbc67..7cca63c45 100644
--- a/plugins/src/sqldrivers/ibase/main.cpp
+++ b/plugins/src/sqldrivers/ibase/main.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/ibase/qsql_ibase.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/ibase/tqsql_ibase.h"
 
 class TQIBaseDriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/mysql/main.cpp b/plugins/src/sqldrivers/mysql/main.cpp
index d34233663..214724393 100644
--- a/plugins/src/sqldrivers/mysql/main.cpp
+++ b/plugins/src/sqldrivers/mysql/main.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/mysql/qsql_mysql.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/mysql/tqsql_mysql.h"
 
 class TQMYSQLDriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/mysql/mysql.pro b/plugins/src/sqldrivers/mysql/mysql.pro
index 9100edaf5..1469a93ea 100644
--- a/plugins/src/sqldrivers/mysql/mysql.pro
+++ b/plugins/src/sqldrivers/mysql/mysql.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlmysql
 CONFIG	+= qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/mysql/qsql_mysql.h
+HEADERS		= ../../../../src/sql/drivers/mysql/tqsql_mysql.h
 SOURCES		= main.cpp \
-		  ../../../../src/sql/drivers/mysql/qsql_mysql.cpp
+		  ../../../../src/sql/drivers/mysql/tqsql_mysql.cpp
 
 unix {
 	OBJECTS_DIR = .obj
diff --git a/plugins/src/sqldrivers/odbc/main.cpp b/plugins/src/sqldrivers/odbc/main.cpp
index 4ee6e59b3..9b26ec984 100644
--- a/plugins/src/sqldrivers/odbc/main.cpp
+++ b/plugins/src/sqldrivers/odbc/main.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/odbc/qsql_odbc.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/odbc/tqsql_odbc.h"
 
 class TQODBCDriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro
index 36d35b51c..735c85be6 100644
--- a/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/plugins/src/sqldrivers/odbc/odbc.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlodbc
 CONFIG  += qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/odbc/qsql_odbc.h
+HEADERS		= ../../../../src/sql/drivers/odbc/tqsql_odbc.h
 SOURCES		= main.cpp \
-		  ../../../../src/sql/drivers/odbc/qsql_odbc.cpp
+		  ../../../../src/sql/drivers/odbc/tqsql_odbc.cpp
 
 mac {
         !contains( LIBS, .*odbc.* ) {
diff --git a/plugins/src/sqldrivers/psql/main.cpp b/plugins/src/sqldrivers/psql/main.cpp
index 5332dfb2d..a0c73b24b 100644
--- a/plugins/src/sqldrivers/psql/main.cpp
+++ b/plugins/src/sqldrivers/psql/main.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/psql/qsql_psql.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/psql/tqsql_psql.h"
 
 class TQPSQLDriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/psql/psql.pro b/plugins/src/sqldrivers/psql/psql.pro
index ad94ccd71..57f47b66e 100644
--- a/plugins/src/sqldrivers/psql/psql.pro
+++ b/plugins/src/sqldrivers/psql/psql.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlpsql
 CONFIG	+= qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/psql/qsql_psql.h
+HEADERS		= ../../../../src/sql/drivers/psql/tqsql_psql.h
 SOURCES		= main.cpp \
-		  ../../../../src/sql/drivers/psql/qsql_psql.cpp
+		  ../../../../src/sql/drivers/psql/tqsql_psql.cpp
 unix {
 	OBJECTS_DIR	= .obj
 	!contains( LIBS, .*pq.* ) {
diff --git a/plugins/src/sqldrivers/sqlite/smain.cpp b/plugins/src/sqldrivers/sqlite/smain.cpp
index 63af92d73..40586e23a 100644
--- a/plugins/src/sqldrivers/sqlite/smain.cpp
+++ b/plugins/src/sqldrivers/sqlite/smain.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/sqlite/qsql_sqlite.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/sqlite/tqsql_sqlite.h"
 
 class TQSQLiteDriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/sqlite/sqlite.pro b/plugins/src/sqldrivers/sqlite/sqlite.pro
index 6234b0d31..51a6ff096 100644
--- a/plugins/src/sqldrivers/sqlite/sqlite.pro
+++ b/plugins/src/sqldrivers/sqlite/sqlite.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlite
 CONFIG	+= qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/sqlite/qsql_sqlite.h
+HEADERS		= ../../../../src/sql/drivers/sqlite/tqsql_sqlite.h
 SOURCES		= smain.cpp \
-		  ../../../../src/sql/drivers/sqlite/qsql_sqlite.cpp
+		  ../../../../src/sql/drivers/sqlite/tqsql_sqlite.cpp
 
 unix {
 	OBJECTS_DIR = .obj
diff --git a/plugins/src/sqldrivers/sqlite3/smain.cpp b/plugins/src/sqldrivers/sqlite3/smain.cpp
index 510199694..9ecee7f57 100644
--- a/plugins/src/sqldrivers/sqlite3/smain.cpp
+++ b/plugins/src/sqldrivers/sqlite3/smain.cpp
@@ -34,8 +34,8 @@
 **
 **********************************************************************/
 
-#include <ntqsqldriverplugin.h>
-#include "../../../../src/sql/drivers/sqlite3/qsql_sqlite3.h"
+#include <tqsqldriverplugin.h>
+#include "../../../../src/sql/drivers/sqlite3/tqsql_sqlite3.h"
 
 class TQSQLite3DriverPlugin : public TQSqlDriverPlugin
 {
diff --git a/plugins/src/sqldrivers/sqlite3/sqlite3.pro b/plugins/src/sqldrivers/sqlite3/sqlite3.pro
index c3184f937..2c5948f3b 100644
--- a/plugins/src/sqldrivers/sqlite3/sqlite3.pro
+++ b/plugins/src/sqldrivers/sqlite3/sqlite3.pro
@@ -4,9 +4,9 @@ TARGET	 = qsqlite3
 CONFIG	+= qt plugin
 DESTDIR	 = ../../../sqldrivers
 
-HEADERS		= ../../../../src/sql/drivers/sqlite3/qsql_sqlite3.h
+HEADERS		= ../../../../src/sql/drivers/sqlite3/tqsql_sqlite3.h
 SOURCES		= smain.cpp \
-		  ../../../../src/sql/drivers/sqlite3/qsql_sqlite3.cpp
+		  ../../../../src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
 
 unix {
 	OBJECTS_DIR = .obj