diff options
author | Mark Brand <mabrand@mabrand.nl> | 2015-11-23 12:19:25 +0100 |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2015-11-27 12:15:15 +0000 |
commit | d6ecdb434410ffda64058cdb51483786f5af9932 (patch) | |
tree | 4ce01725938a7d19b6bb3313492be0cac282d626 /src/sql/drivers/odbc | |
parent | 6333edfdf3a682dfa8f54fe021f9aa55d6c91049 (diff) |
qsql: move Q<driver>Result out of header
Leaf result classes do not need to be exposed in the headers. The
implementations were inconsistent on this point.
Change-Id: I5bd41ae9e77b932f6232218a014400a59f2ef5a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/sql/drivers/odbc')
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 36 | ||||
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc_p.h | 37 |
2 files changed, 36 insertions, 37 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 8c4ec484cc..19d669b8c3 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -50,6 +50,7 @@ #include <QDebug> #include <QSqlQuery> #include <QtSql/private/qsqldriver_p.h> +#include <QtSql/private/qsqlresult_p.h> QT_BEGIN_NAMESPACE @@ -143,6 +144,41 @@ private: QChar quote; }; +class QODBCResultPrivate; + +class QODBCResult: public QSqlResult +{ +public: + QODBCResult(const QODBCDriver *db, QODBCDriverPrivate *p); + virtual ~QODBCResult(); + + bool prepare(const QString &query); + bool exec(); + + QVariant lastInsertId() const; + QVariant handle() const; + virtual void setForwardOnly(bool forward); + +protected: + bool fetchNext(); + bool fetchFirst(); + bool fetchLast(); + bool fetchPrevious(); + bool fetch(int i); + bool reset (const QString &query); + QVariant data(int field); + bool isNull(int field); + int size(); + int numRowsAffected(); + QSqlRecord record() const; + void virtual_hook(int id, void *data); + void detachFromResultSet(); + bool nextResult(); + +private: + QODBCResultPrivate *d; +}; + class QODBCResultPrivate { public: diff --git a/src/sql/drivers/odbc/qsql_odbc_p.h b/src/sql/drivers/odbc/qsql_odbc_p.h index 9c864b467d..407280ebb9 100644 --- a/src/sql/drivers/odbc/qsql_odbc_p.h +++ b/src/sql/drivers/odbc/qsql_odbc_p.h @@ -46,7 +46,6 @@ // #include <QtSql/qsqldriver.h> -#include <QtSql/qsqlresult.h> #if defined (Q_OS_WIN32) #include <QtCore/qt_windows.h> @@ -75,43 +74,7 @@ QT_BEGIN_NAMESPACE -class QODBCResultPrivate; class QODBCDriverPrivate; -class QODBCDriver; -class QSqlRecordInfo; - -class QODBCResult : public QSqlResult -{ -public: - QODBCResult(const QODBCDriver * db, QODBCDriverPrivate* p); - virtual ~QODBCResult(); - - bool prepare(const QString& query); - bool exec(); - - QVariant lastInsertId() const; - QVariant handle() const; - virtual void setForwardOnly(bool forward); - -protected: - bool fetchNext(); - bool fetchFirst(); - bool fetchLast(); - bool fetchPrevious(); - bool fetch(int i); - bool reset (const QString& query); - QVariant data(int field); - bool isNull(int field); - int size(); - int numRowsAffected(); - QSqlRecord record() const; - void virtual_hook(int id, void *data); - void detachFromResultSet(); - bool nextResult(); - -private: - QODBCResultPrivate *d; -}; class Q_EXPORT_SQLDRIVER_ODBC QODBCDriver : public QSqlDriver { |