diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-03-30 19:55:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 19:02:26 +0200 |
| commit | 406c8ef6e67da5505c7404a2517a8b4204d7c38a (patch) | |
| tree | 1257c680456e3fa4e386995f7703096982863ac0 /src/sql/drivers/db2 | |
| parent | dcf9c403ba8e903bb52a6fb656c7e2de23383c10 (diff) | |
Move the dbmstype to QSqlDriverPrivate so it can be used for all drivers
By moving it to QSqlDriverPrivate we make it easier to check what
database is actually connected which is particularly useful for the
autotests.
Change-Id: I54d1c2c998919c1d54efb1b6ac9303070ece54aa
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql/drivers/db2')
| -rw-r--r-- | src/sql/drivers/db2/qsql_db2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp index 50a9af23bc..25da004db8 100644 --- a/src/sql/drivers/db2/qsql_db2.cpp +++ b/src/sql/drivers/db2/qsql_db2.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qsql_db2_p.h" +#include <QtSql/private/qsqldriver_p.h> #include <qcoreapplication.h> #include <qdatetime.h> #include <qsqlfield.h> @@ -70,10 +71,10 @@ QT_BEGIN_NAMESPACE static const int COLNAMESIZE = 255; static const SQLSMALLINT qParamType[4] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT }; -class QDB2DriverPrivate +class QDB2DriverPrivate : public QSqlDriverPrivate { public: - QDB2DriverPrivate(): hEnv(0), hDbc(0) {} + QDB2DriverPrivate() : QSqlDriverPrivate(), hEnv(0), hDbc(0) { dbmsType = DB2; } SQLHANDLE hEnv; SQLHANDLE hDbc; QString user; @@ -1151,7 +1152,6 @@ QDB2Driver::QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent) QDB2Driver::~QDB2Driver() { close(); - delete d; } bool QDB2Driver::open(const QString& db, const QString& user, const QString& password, const QString& host, int port, |