Remove dependency of DB driver headers on qsqlcachedresult_p.h.

Move the QXXResult classes inheriting the private class
QSqlCachedResult from header into the source files for
SQLite, SQLite2, Interbase/Firebird and TDS/Sybase and
Oracle.

Task-number: QTBUG-28088
Change-Id: Ia16d30e442e313c8165282b8a3f012fd95d96759
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

2 files changed, 25 insertions, 24 deletions

diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index 02e4004901..2666cefb72 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -50,6 +50,7 @@
 #include <qsqlfield.h>
 #include <qsqlindex.h>
 #include <qsqlquery.h>
+#include <QtSql/private/qsqlcachedresult_p.h>
 #include <qstringlist.h>
 #include <qvector.h>
 
@@ -94,6 +95,30 @@ QSQLite2DriverPrivate::QSQLite2DriverPrivate() : access(0)
     utf8 = (qstrcmp(sqlite_encoding, "UTF-8") == 0);
 }
 
+class QSQLite2ResultPrivate;
+
+class QSQLite2Result : public QSqlCachedResult
+{
+    friend class QSQLite2Driver;
+    friend class QSQLite2ResultPrivate;
+public:
+    explicit QSQLite2Result(const QSQLite2Driver* db);
+    ~QSQLite2Result();
+    QVariant handle() const;
+
+protected:
+    bool gotoNext(QSqlCachedResult::ValueCache& row, int idx);
+    bool reset (const QString& query);
+    int size();
+    int numRowsAffected();
+    QSqlRecord record() const;
+    void detachFromResultSet();
+    void virtual_hook(int id, void *data);
+
+private:
+    QSQLite2ResultPrivate* d;
+};
+
 class QSQLite2ResultPrivate
 {
 public:
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.h b/src/sql/drivers/sqlite2/qsql_sqlite2.h
index a91a7c58f1..c6a8c4cf4f 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.h
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.h
@@ -46,7 +46,6 @@
 #include <QtSql/qsqlresult.h>
 #include <QtSql/qsqlrecord.h>
 #include <QtSql/qsqlindex.h>
-#include <QtSql/private/qsqlcachedresult_p.h>
 
 #if defined (Q_OS_WIN32)
 # include <QtCore/qt_windows.h>
@@ -62,31 +61,8 @@ QT_BEGIN_NAMESPACE
 #endif
 
 class QSQLite2DriverPrivate;
-class QSQLite2ResultPrivate;
 class QSQLite2Driver;
 
-class QSQLite2Result : public QSqlCachedResult
-{
-    friend class QSQLite2Driver;
-    friend class QSQLite2ResultPrivate;
-public:
-    explicit QSQLite2Result(const QSQLite2Driver* db);
-    ~QSQLite2Result();
-    QVariant handle() const;
-
-protected:
-    bool gotoNext(QSqlCachedResult::ValueCache& row, int idx);
-    bool reset (const QString& query);
-    int size();
-    int numRowsAffected();
-    QSqlRecord record() const;
-    void detachFromResultSet();
-    void virtual_hook(int id, void *data);
-
-private:
-    QSQLite2ResultPrivate* d;
-};
-
 class QSQLite2Driver : public QSqlDriver
 {
     Q_OBJECT