1 files changed, 19 insertions, 49 deletions

diff --git a/src/sql/drivers/db2/qsql_db2_p.h b/src/sql/drivers/db2/qsql_db2_p.h
index 7b5d751b89..0b07456122 100644
--- a/src/sql/drivers/db2/qsql_db2_p.h
+++ b/src/sql/drivers/db2/qsql_db2_p.h
@@ -53,70 +53,40 @@
 #define Q_EXPORT_SQLDRIVER_DB2 Q_SQL_EXPORT
 #endif
 
-#include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDB2Driver;
 class QDB2DriverPrivate;
-class QDB2ResultPrivate;
-class QSqlRecord;
-
-class QDB2Result : public QSqlResult
-{
-public:
-    QDB2Result(const QDB2Driver* dr, const QDB2DriverPrivate* dp);
-    ~QDB2Result();
-    bool prepare(const QString& query);
-    bool exec();
-    QVariant handle() const;
-
-protected:
-    QVariant data(int field);
-    bool reset (const QString& query);
-    bool fetch(int i);
-    bool fetchNext();
-    bool fetchFirst();
-    bool fetchLast();
-    bool isNull(int i);
-    int size();
-    int numRowsAffected();
-    QSqlRecord record() const;
-    void virtual_hook(int id, void *data);
-    void detachFromResultSet();
-    bool nextResult();
-
-private:
-    QDB2ResultPrivate* d;
-};
 
 class Q_EXPORT_SQLDRIVER_DB2 QDB2Driver : public QSqlDriver
 {
     Q_DECLARE_PRIVATE(QDB2Driver)
     Q_OBJECT
+    friend class QDB2ResultPrivate;
+
 public:
     explicit QDB2Driver(QObject* parent = 0);
     QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent = 0);
     ~QDB2Driver();
-    bool hasFeature(DriverFeature) const;
-    void close();
-    QSqlRecord record(const QString& tableName) const;
-    QStringList tables(QSql::TableType type) const;
-    QSqlResult *createResult() const;
-    QSqlIndex primaryIndex(const QString& tablename) const;
-    bool beginTransaction();
-    bool commitTransaction();
-    bool rollbackTransaction();
-    QString formatValue(const QSqlField &field, bool trimStrings) const;
-    QVariant handle() const;
-    bool open(const QString& db,
-               const QString& user,
-               const QString& password,
-               const QString& host,
+    bool hasFeature(DriverFeature) const Q_DECL_OVERRIDE;
+    void close() Q_DECL_OVERRIDE;
+    QSqlRecord record(const QString &tableName) const Q_DECL_OVERRIDE;
+    QStringList tables(QSql::TableType type) const Q_DECL_OVERRIDE;
+    QSqlResult *createResult() const Q_DECL_OVERRIDE;
+    QSqlIndex primaryIndex(const QString &tablename) const Q_DECL_OVERRIDE;
+    bool beginTransaction() Q_DECL_OVERRIDE;
+    bool commitTransaction() Q_DECL_OVERRIDE;
+    bool rollbackTransaction() Q_DECL_OVERRIDE;
+    QString formatValue(const QSqlField &field, bool trimStrings) const Q_DECL_OVERRIDE;
+    QVariant handle() const Q_DECL_OVERRIDE;
+    bool open(const QString &db,
+               const QString &user,
+               const QString &password,
+               const QString &host,
                int port,
-               const QString& connOpts);
-    QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
+               const QString& connOpts) Q_DECL_OVERRIDE;
+    QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE;
 
 private:
     bool setAutoCommit(bool autoCommit);