diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-04-23 15:12:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 06:37:06 +0200 |
| commit | 89ecac46075e51c8125a96bb98e99d39f546dacd (patch) | |
| tree | 48f2c68bfebc34133fee9de5987292f4aada9d81 /src/sql/kernel/qsqlerror.cpp | |
| parent | c0825cbfc0c568542a9e4c09e23d42eb76a5a706 (diff) | |
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>
Diffstat (limited to 'src/sql/kernel/qsqlerror.cpp')
| -rw-r--r-- | src/sql/kernel/qsqlerror.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 |