From 89ecac46075e51c8125a96bb98e99d39f546dacd Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Wed, 23 Apr 2014 15:12:46 +0200
Subject: QSqlError: Mark deprecated functiond with QT_DEPRECATED

And move the default argument from the deprecated constructor to
the new one

Also make sure that the error number is consistent across the
two constructor

Change-Id: I3721266b39ab493f0add35b2d1f892b2f6094992
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/sql/kernel/qsqlerror.cpp |  5 +++--
 src/sql/kernel/qsqlerror.h   | 16 +++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp
index 1763722e8a..1979e5d1f5 100644
--- a/src/sql/kernel/qsqlerror.cpp
+++ b/src/sql/kernel/qsqlerror.cpp
@@ -107,7 +107,8 @@ QSqlError::QSqlError(const QString& driverText, const QString& databaseText, Err
     d->driverError = driverText;
     d->databaseError = databaseText;
     d->errorType = type;
-    d->errorCode = QString::number(number);
+    if (number != -1)
+        d->errorCode = QString::number(number);
 }
 #endif
 
@@ -287,7 +288,7 @@ void QSqlError::setType(ErrorType type)
 #if QT_DEPRECATED_SINCE(5, 3)
 int QSqlError::number() const
 {
-    return d->errorCode.toInt();
+    return d->errorCode.isEmpty() ? -1 : d->errorCode.toInt();
 }
 #endif
 
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 4e27ab03ae..679e0f9e3c 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -60,15 +60,13 @@ public:
         UnknownError
     };
 #if QT_DEPRECATED_SINCE(5, 3)
-    QSqlError( const QString& driverText = QString(),
-                const QString& databaseText = QString(),
-                ErrorType type = NoError,
-                int number = -1);
+    QT_DEPRECATED QSqlError(const QString &driverText, const QString &databaseText,
+                            ErrorType type, int number);
 #endif
-    QSqlError(const QString &driverText,
-              const QString &databaseText,
-              ErrorType type,
-              const QString &errorCode);
+    QSqlError(const QString &driverText = QString(),
+              const QString &databaseText = QString(),
+              ErrorType type = NoError,
+              const QString &errorCode = QString());
     QSqlError(const QSqlError& other);
     QSqlError& operator=(const QSqlError& other);
     bool operator==(const QSqlError& other) const;
@@ -79,7 +77,7 @@ public:
     QString databaseText() const;
     ErrorType type() const;
 #if QT_DEPRECATED_SINCE(5, 3)
-    int number() const;
+    QT_DEPRECATED int number() const;
 #endif
     QString nativeErrorCode() const;
     QString text() const;
-- 
cgit v1.2.3