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/odbc/qsql_odbc.cpp | |
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/odbc/qsql_odbc.cpp')
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 04bc0cc894..05f740cb41 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1710,19 +1710,17 @@ bool QODBCResult::nextResult() void QODBCResult::virtual_hook(int id, void *data) { switch (id) { - case QSqlResult::DetachFromResultSet: - if (d->hStmt) - SQLCloseCursor(d->hStmt); - break; - case QSqlResult::NextResult: - Q_ASSERT(data); - *static_cast<bool*>(data) = nextResult(); - break; default: QSqlResult::virtual_hook(id, data); } } +void QODBCResult::detachFromResultSet() +{ + if (d->hStmt) + SQLCloseCursor(d->hStmt); +} + void QODBCResult::setForwardOnly(bool forward) { d->userForwardOnly = forward; |