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/ibase/qsql_ibase.cpp | |
| 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/ibase/qsql_ibase.cpp')
| -rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index abf6a74c3e..2137514679 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -48,6 +48,7 @@ #include <qsqlindex.h> #include <qsqlquery.h> #include <QtSql/private/qsqlcachedresult_p.h> +#include <QtSql/private/qsqldriver_p.h> #include <qlist.h> #include <qvector.h> #include <qtextcodec.h> @@ -309,10 +310,10 @@ struct QIBaseEventBuffer { QIBaseSubscriptionState subscriptionState; }; -class QIBaseDriverPrivate +class QIBaseDriverPrivate : public QSqlDriverPrivate { public: - QIBaseDriverPrivate(QIBaseDriver *d) : q(d), ibase(0), trans(0), tc(0) {} + QIBaseDriverPrivate(QIBaseDriver *d) : QSqlDriverPrivate(), q(d), ibase(0), trans(0), tc(0) { dbmsType = Interbase; } bool isError(const char *msg, QSqlError::ErrorType typ = QSqlError::UnknownError) { @@ -1411,7 +1412,6 @@ QIBaseDriver::QIBaseDriver(isc_db_handle connection, QObject *parent) QIBaseDriver::~QIBaseDriver() { - delete d; } bool QIBaseDriver::hasFeature(DriverFeature f) const |