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/kernel/qsqlresult.h | |
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/kernel/qsqlresult.h')
-rw-r--r-- | src/sql/kernel/qsqlresult.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 162451c6dd..9c4213f363 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -125,13 +125,13 @@ protected: virtual QSqlRecord record() const; virtual QVariant lastInsertId() const; - enum VirtualHookOperation { BatchOperation, DetachFromResultSet, SetNumericalPrecision, NextResult }; + enum VirtualHookOperation { }; virtual void virtual_hook(int id, void *data); - bool execBatch(bool arrayBind = false); - void detachFromResultSet(); - void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy); + virtual bool execBatch(bool arrayBind = false); + virtual void detachFromResultSet(); + virtual void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy); QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const; - bool nextResult(); + virtual bool nextResult(); private: QSqlResultPrivate* d; |