[Development] Qt 5.3 header diff: QtSql

[Thiago Macieira]

http://macieira.org/~thiago/qt-5.3/QtSql.diff

diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index 017ffd4..f93a030 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -62,6 +62,7 @@ class QVariant;
 class Q_SQL_EXPORT QSqlDriver : public QObject
 {
     friend class QSqlDatabase;
+    friend class QSqlResultPrivate;
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSqlDriver)
 
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 39c4cda..4e27ab0 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -47,6 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QSqlErrorPrivate;
 
 class Q_SQL_EXPORT QSqlError
 {
@@ -58,10 +59,16 @@ public:
         TransactionError,
         UnknownError
     };
+#if QT_DEPRECATED_SINCE(5, 3)
     QSqlError( const QString& driverText = QString(),
                 const QString& databaseText = QString(),
                 ErrorType type = NoError,
                 int number = -1);
+#endif
+    QSqlError(const QString &driverText,
+              const QString &databaseText,
+              ErrorType type,
+              const QString &errorCode);
     QSqlError(const QSqlError& other);
     QSqlError& operator=(const QSqlError& other);
     bool operator==(const QSqlError& other) const;
@@ -71,7 +78,10 @@ public:
     QString driverText() const;
     QString databaseText() const;
     ErrorType type() const;
+#if QT_DEPRECATED_SINCE(5, 3)
     int number() const;
+#endif
+    QString nativeErrorCode() const;
     QString text() const;
     bool isValid() const;
 
@@ -83,10 +93,17 @@ public:
 #endif
 
 private:
-    QString driverError;
-    QString databaseError;
-    ErrorType errorType;
-    int errorNumber;
+    // ### Qt6: Keep the pointer and remove the rest.
+    QString unused1;
+    QString unused2;
+    struct Unused {
+        ErrorType unused3;
+        int unused4;
+    };
+    union {
+        QSqlErrorPrivate *d;
+        Unused unused5;
+    };
 };
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index 3719643..ef48b91 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -70,6 +70,7 @@ public:
     bool isValid() const;
     bool isActive() const;
     bool isNull(int field) const;
+    bool isNull(const QString &name) const;
     int at() const;
     QString lastQuery() const;
     int numRowsAffected() const;

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development