1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSqlError: rename ctor parameter to 'nativeErrorCode'

Browse Source 
Rename the parameter 'code' to 'nativeErrorCode' to match the getter
nativeErrorCode() with the ctor's parameters.

Pick-to: 6.8
Change-Id: Ic95b45c75a57796536d845249c719b5d0d0e7587
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 06ef995a7d348c9769091b07e4511c3c9511a104)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2025-03-30 10:28:14 +02:00 committed by Qt Cherry-pick Bot
parent 3b175fbecc
commit 1f5545e6f2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/kernel/qsqlerror.cpp
View File

@ -85,16 +85,16 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QSqlErrorPrivate)
/*! /*!
Constructs an error containing the driver error text \a Constructs an error containing the driver error text \a
driverText, the database-specific error text \a databaseText, the driverText, the database-specific error text \a databaseText, the
type \a type and the error code \a code. type \a type and the native error code \a nativeErrorCode.
*/ */
QSqlError::QSqlError(const QString &driverText, const QString &databaseText, QSqlError::QSqlError(const QString &driverText, const QString &databaseText,
ErrorType type, const QString &code) ErrorType type, const QString &nativeErrorCode)
: d(new QSqlErrorPrivate) : d(new QSqlErrorPrivate)
{ {
d->driverError = driverText; d->driverError = driverText;
d->databaseError = databaseText; d->databaseError = databaseText;
d->errorType = type; d->errorType = type;
d->errorCode = code; d->errorCode = nativeErrorCode;
} }
@ -176,8 +176,8 @@ QSqlError::ErrorType QSqlError::type() const
} }
/*! /*!
Returns the database-specific error code, or an empty string if Returns the database-specific (native) error code, or an empty
it cannot be determined. string if it cannot be determined.
\note Some drivers (like DB2 or ODBC) may return more than one \note Some drivers (like DB2 or ODBC) may return more than one
error code. When this happens, \c ; is used as separator between error code. When this happens, \c ; is used as separator between
the error codes. the error codes.

2
src/sql/kernel/qsqlerror.h
View File

@ -26,7 +26,7 @@ public:
QSqlError(const QString &driverText = QString(), QSqlError(const QString &driverText = QString(),
const QString &databaseText = QString(), const QString &databaseText = QString(),
ErrorType type = NoError, ErrorType type = NoError,
const QString &errorCode = QString()); const QString &nativeErrorCode = QString());
QSqlError(const QSqlError &other); QSqlError(const QSqlError &other);
QSqlError(QSqlError &&other) noexcept = default; QSqlError(QSqlError &&other) noexcept = default;
QSqlError& operator=(const QSqlError &other); QSqlError& operator=(const QSqlError &other);