Rename the SQL driver header files to _p.h (make private)

The drivers were never public API. They were exposed by mistake in public headers. What's more, they have #include'd a private header (qsqlcachedresult_p.h) since at least Qt 4.5.1. That means no one used those headers in Qt 4 (private headers weren't installed then) and it's unlikely anyone did in 5.0. Change-Id: Ie0a47bcf0260ee6bdd3d8494b78fd1eec28a2d6b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
2013-02-21 16:54:24 -08:00 · 2013-02-21 16:54:24 -08:00 · 1ee1147462
commit 1ee1147462
parent 26149d057a
38 changed files with 36 additions and 54 deletions
--- a/src/plugins/sqldrivers/db2/main.cpp
+++ b/src/plugins/sqldrivers/db2/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/db2/qsql_db2.h"
+#include "../../../sql/drivers/db2/qsql_db2_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/ibase/main.cpp
+++ b/src/plugins/sqldrivers/ibase/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/ibase/qsql_ibase.h"
+#include "../../../sql/drivers/ibase/qsql_ibase_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/mysql/main.cpp
+++ b/src/plugins/sqldrivers/mysql/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/mysql/qsql_mysql.h"
+#include "../../../sql/drivers/mysql/qsql_mysql_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/oci/main.cpp
+++ b/src/plugins/sqldrivers/oci/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/oci/qsql_oci.h"
+#include "../../../sql/drivers/oci/qsql_oci_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/odbc/main.cpp
+++ b/src/plugins/sqldrivers/odbc/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/odbc/qsql_odbc.h"
+#include "../../../sql/drivers/odbc/qsql_odbc_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/psql/main.cpp
+++ b/src/plugins/sqldrivers/psql/main.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../sql/drivers/psql/qsql_psql.h"
+#include "../../../sql/drivers/psql/qsql_psql_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/sqlite/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite/smain.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../../src/sql/drivers/sqlite/qsql_sqlite.h"
+#include "../../../../src/sql/drivers/sqlite/qsql_sqlite_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/sqlite2/smain.cpp
+++ b/src/plugins/sqldrivers/sqlite2/smain.cpp
@ -41,7 +41,7 @@

 #include <qsqldriverplugin.h>
 #include <qstringlist.h>
-#include "../../../../src/sql/drivers/sqlite2/qsql_sqlite2.h"
+#include "../../../../src/sql/drivers/sqlite2/qsql_sqlite2_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/plugins/sqldrivers/tds/main.cpp
+++ b/src/plugins/sqldrivers/tds/main.cpp
@ -47,7 +47,7 @@
 #define _WINSCARD_H_
 #include <windows.h>
 #endif
-#include "../../../sql/drivers/tds/qsql_tds.h"
+#include "../../../sql/drivers/tds/qsql_tds_p.h"

 QT_BEGIN_NAMESPACE

--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_db2.h"
+#include "qsql_db2_p.h"
 #include <qcoreapplication.h>
 #include <qdatetime.h>
 #include <qsqlfield.h>
--- a/src/sql/drivers/db2/qsql_db2.pri
+++ b/src/sql/drivers/db2/qsql_db2.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_db2.h
+HEADERS += $$PWD/qsql_db2_p.h
 SOURCES += $$PWD/qsql_db2.cpp

 unix {
--- a/src/sql/drivers/db2/qsql_db2_p.h
+++ b/src/sql/drivers/db2/qsql_db2_p.h
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_ibase.h"
+#include "qsql_ibase_p.h"
 #include <qcoreapplication.h>
 #include <qdatetime.h>
 #include <qvariant.h>
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_ibase.h
+HEADERS += $$PWD/qsql_ibase_p.h
 SOURCES += $$PWD/qsql_ibase.cpp

 unix {
--- a/src/sql/drivers/ibase/qsql_ibase_p.h
+++ b/src/sql/drivers/ibase/qsql_ibase_p.h
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_mysql.h"
+#include "qsql_mysql_p.h"

 #include <qcoreapplication.h>
 #include <qvariant.h>
--- a/src/sql/drivers/mysql/qsql_mysql.pri
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_mysql.h
+HEADERS += $$PWD/qsql_mysql_p.h
 SOURCES += $$PWD/qsql_mysql.cpp

 !isEmpty(MYSQL_PATH) {
--- a/src/sql/drivers/mysql/qsql_mysql_p.h
+++ b/src/sql/drivers/mysql/qsql_mysql_p.h
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_oci.h"
+#include "qsql_oci_p.h"

 #include <qcoreapplication.h>
 #include <qvariant.h>
--- a/src/sql/drivers/oci/qsql_oci.pri
+++ b/src/sql/drivers/oci/qsql_oci.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_oci.h
+HEADERS += $$PWD/qsql_oci_p.h
 SOURCES += $$PWD/qsql_oci.cpp

 unix {
--- a/src/sql/drivers/oci/qsql_oci_p.h
+++ b/src/sql/drivers/oci/qsql_oci_p.h
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_odbc.h"
+#include "qsql_odbc_p.h"
 #include <qsqlrecord.h>

 #if defined (Q_OS_WIN32)
--- a/src/sql/drivers/odbc/qsql_odbc.pri
+++ b/src/sql/drivers/odbc/qsql_odbc.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_odbc.h
+HEADERS += $$PWD/qsql_odbc_p.h
 SOURCES += $$PWD/qsql_odbc.cpp

 unix {
--- a/src/sql/drivers/odbc/qsql_odbc_p.h
+++ b/src/sql/drivers/odbc/qsql_odbc_p.h
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_psql.h"
+#include "qsql_psql_p.h"

 #include <qcoreapplication.h>
 #include <qvariant.h>
--- a/src/sql/drivers/psql/qsql_psql.pri
+++ b/src/sql/drivers/psql/qsql_psql.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_psql.h
+HEADERS += $$PWD/qsql_psql_p.h
 SOURCES += $$PWD/qsql_psql.cpp

 unix|win32-g++* {
--- a/src/sql/drivers/psql/qsql_psql_p.h
+++ b/src/sql/drivers/psql/qsql_psql_p.h
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_sqlite.h"
+#include "qsql_sqlite_p.h"

 #include <qcoreapplication.h>
 #include <qvariant.h>
--- a/src/sql/drivers/sqlite/qsql_sqlite.pri
+++ b/src/sql/drivers/sqlite/qsql_sqlite.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_sqlite.h
+HEADERS += $$PWD/qsql_sqlite_p.h
 SOURCES += $$PWD/qsql_sqlite.cpp

 !system-sqlite:!contains(LIBS, .*sqlite3.*) {
--- a/src/sql/drivers/sqlite/qsql_sqlite_p.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite_p.h
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_sqlite2.h"
+#include "qsql_sqlite2_p.h"

 #include <qcoreapplication.h>
 #include <qvariant.h>
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.pri
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_sqlite2.h
+HEADERS += $$PWD/qsql_sqlite2_p.h
 SOURCES += $$PWD/qsql_sqlite2.cpp

 !contains(LIBS, .*sqlite.*):LIBS += -lsqlite
--- a/src/sql/drivers/sqlite2/qsql_sqlite2_p.h
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2_p.h
--- a/src/sql/drivers/tds/qsql_tds.cpp
+++ b/src/sql/drivers/tds/qsql_tds.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include "qsql_tds.h"
+#include "qsql_tds_p.h"

 #include <qglobal.h>
 #ifdef Q_OS_WIN32    // We assume that MS SQL Server is used. Set Q_USE_SYBASE to force Sybase.
--- a/src/sql/drivers/tds/qsql_tds.pri
+++ b/src/sql/drivers/tds/qsql_tds.pri
@ -1,4 +1,4 @@
-HEADERS += $$PWD/qsql_tds.h
+HEADERS += $$PWD/qsql_tds_p.h
 SOURCES += $$PWD/qsql_tds.cpp

 unix|win32-g++*: {
--- a/src/sql/drivers/tds/qsql_tds_p.h
+++ b/src/sql/drivers/tds/qsql_tds_p.h
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@ -48,31 +48,31 @@
 #endif

 #ifdef QT_SQL_PSQL
-#include "../drivers/psql/qsql_psql.h"
+#include "../drivers/psql/qsql_psql_p.h"
 #endif
 #ifdef QT_SQL_MYSQL
-#include "../drivers/mysql/qsql_mysql.h"
+#include "../drivers/mysql/qsql_mysql_p.h"
 #endif
 #ifdef QT_SQL_ODBC
-#include "../drivers/odbc/qsql_odbc.h"
+#include "../drivers/odbc/qsql_odbc_p.h"
 #endif
 #ifdef QT_SQL_OCI
-#include "../drivers/oci/qsql_oci.h"
+#include "../drivers/oci/qsql_oci_p.h"
 #endif
 #ifdef QT_SQL_TDS
 // conflicting RETCODE typedef between odbc and freetds
 #define RETCODE DBRETCODE
-#include "../drivers/tds/qsql_tds.h"
+#include "../drivers/tds/qsql_tds_p.h"
 #undef RETCODE
 #endif
 #ifdef QT_SQL_DB2
-#include "../drivers/db2/qsql_db2.h"
+#include "../drivers/db2/qsql_db2_p.h"
 #endif
 #ifdef QT_SQL_SQLITE
-#include "../drivers/sqlite/qsql_sqlite.h"
+#include "../drivers/sqlite/qsql_sqlite_p.h"
 #endif
 #ifdef QT_SQL_SQLITE2
-#include "../drivers/sqlite2/qsql_sqlite2.h"
+#include "../drivers/sqlite2/qsql_sqlite2_p.h"
 #endif
 #ifdef QT_SQL_IBASE
 #undef SQL_FLOAT  // avoid clash with ODBC
@ -82,7 +82,7 @@
 #undef SQL_TYPE_DATE
 #undef SQL_DATE
 #define SCHAR IBASE_SCHAR  // avoid clash with ODBC (older versions of ibase.h with Firebird)
-#include "../drivers/ibase/qsql_ibase.h"
+#include "../drivers/ibase/qsql_ibase_p.h"
 #undef SCHAR
 #endif

--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@ -556,24 +556,6 @@ QT_CLASS_LIB(QSqlRelationalDelegate, QtSql, qsqlrelationaldelegate.h)
 QT_CLASS_LIB(QSqlRelation, QtSql, qsqlrelationaltablemodel.h)
 QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h)
 QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h)
-QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h)
-QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h)
-QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
-QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
-QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
-QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
-QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h)
-QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h)
-QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
-QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
-QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h)
-QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h)
-QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
-QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
-QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
-QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
-QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
-QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
 QT_CLASS_LIB(QAccessible, QtWidgets, qaccessible.h)
 QT_CLASS_LIB(QAccessibleInterface, QtWidgets, qaccessible.h)
 QT_CLASS_LIB(QAccessibleInterfaceEx, QtWidgets, qaccessible.h)