1 files changed, 20 insertions, 56 deletions

diff --git a/src/sql/drivers/odbc/qsql_odbc_p.h b/src/sql/drivers/odbc/qsql_odbc_p.h
index 96e7abd7dd..25cc6aaa2c 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,81 +74,46 @@
 
 QT_BEGIN_NAMESPACE
 
-class QODBCPrivate;
 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:
-    QODBCPrivate *d;
-};
 
 class Q_EXPORT_SQLDRIVER_ODBC QODBCDriver : public QSqlDriver
 {
     Q_DECLARE_PRIVATE(QODBCDriver)
     Q_OBJECT
+    friend class QODBCResultPrivate;
+
 public:
     explicit QODBCDriver(QObject *parent=0);
     QODBCDriver(SQLHANDLE env, SQLHANDLE con, QObject * parent=0);
     virtual ~QODBCDriver();
-    bool hasFeature(DriverFeature f) const;
-    void close();
-    QSqlResult *createResult() const;
-    QStringList tables(QSql::TableType) const;
-    QSqlRecord record(const QString& tablename) const;
-    QSqlIndex primaryIndex(const QString& tablename) const;
-    QVariant handle() const;
+    bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE;
+    void close() Q_DECL_OVERRIDE;
+    QSqlResult *createResult() const Q_DECL_OVERRIDE;
+    QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE;
+    QSqlRecord record(const QString &tablename) const Q_DECL_OVERRIDE;
+    QSqlIndex primaryIndex(const QString &tablename) const Q_DECL_OVERRIDE;
+    QVariant handle() const Q_DECL_OVERRIDE;
     QString formatValue(const QSqlField &field,
-                        bool trimStrings) const;
-    bool open(const QString& db,
-              const QString& user,
-              const QString& password,
-              const QString& host,
+                        bool trimStrings) const Q_DECL_OVERRIDE;
+    bool open(const QString &db,
+              const QString &user,
+              const QString &password,
+              const QString &host,
               int port,
-              const QString& connOpts);
+              const QString &connOpts) Q_DECL_OVERRIDE;
 
-    QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
+    QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE;
 
-    bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const;
+    bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE;
 
 protected:
-    bool beginTransaction();
-    bool commitTransaction();
-    bool rollbackTransaction();
+    bool beginTransaction() Q_DECL_OVERRIDE;
+    bool commitTransaction() Q_DECL_OVERRIDE;
+    bool rollbackTransaction() Q_DECL_OVERRIDE;
 
 private:
     bool endTrans();
     void cleanup();
-    friend class QODBCPrivate;
 };
 
 QT_END_NAMESPACE