diff options
author | Mark Brand <mabrand@mabrand.nl> | 2012-06-05 13:50:03 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 13:23:51 +0200 |
commit | fc15a1d5e2cb064df7b6e7b9e821e9db20a91b85 (patch) | |
tree | 45355e4d5426f63c158353b0dea18457c76dbf6c /src/sql/drivers/sqlite2 | |
parent | 637ecd571f10bbab36b3321edb0479d79a542ddb (diff) |
QSqlResult: replace virtual hooks with virtual functions
Instead of virtual functions which would have broken binary
compatibility, virtual_hook() was used to implement the virtual
functionality. Now, since the step to Qt 5.0 allows breaking
binary compatibility, we take the opporunity to simplify the code
using real virtual functions.
SetNumericalPrecision --> setNumericalPrecisionPolicy()
NextResult --> nextResult()
DetachFromResultSet --> detachFromResultSet()
BatchOperation --> execBatch()
Task-number: QTBUG-25252
Change-Id: Idd3a870f876d8b8a7457559d5f31ec2073786a75
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/sql/drivers/sqlite2')
-rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 8 | ||||
-rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index 53876404c0..70dd178497 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -267,9 +267,6 @@ QSQLite2Result::~QSQLite2Result() void QSQLite2Result::virtual_hook(int id, void *data) { switch (id) { - case QSqlResult::DetachFromResultSet: - d->finalize(); - break; default: QSqlCachedResult::virtual_hook(id, data); } @@ -343,6 +340,11 @@ QSqlRecord QSQLite2Result::record() const return d->rInf; } +void QSQLite2Result::detachFromResultSet() +{ + d->finalize(); +} + QVariant QSQLite2Result::handle() const { return QVariant::fromValue(d->currentMachine); diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.h b/src/sql/drivers/sqlite2/qsql_sqlite2.h index 4df870f3ae..83961ec371 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.h +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.h @@ -77,6 +77,7 @@ protected: int size(); int numRowsAffected(); QSqlRecord record() const; + void detachFromResultSet(); void virtual_hook(int id, void *data); private: |