From 8247ce9766594cc740bb15415b162ec7f1b00f6a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 9 Jan 2018 17:17:57 +0100 Subject: SQL plugins: Fix warnings about deprecated constructor of QSqlError Use the constructor taking a string and convert number unless it is -1. Change-Id: I18d1ba2c8e0d3f4af01b7955863967f75051746b Reviewed-by: Andy Shaw --- src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 3 ++- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++-- src/plugins/sqldrivers/oci/qsql_oci.cpp | 3 ++- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 6 ++++-- src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp | 3 ++- src/plugins/sqldrivers/tds/qsql_tds.cpp | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 218cd75c69..d89051191c 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -388,7 +388,8 @@ public: return false; q->setLastError(QSqlError(QCoreApplication::translate("QIBaseResult", msg), - imsg, typ, int(sqlcode))); + imsg, typ, + sqlcode != -1 ? QString::number(sqlcode) : QString())); return true; } diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index f84a0081df..696c8bc1d3 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -269,7 +269,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const char *cerr = p->mysql ? mysql_error(p->mysql) : 0; return QSqlError(QLatin1String("QMYSQL: ") + err, p->tc ? toUnicode(p->tc, cerr) : QString::fromLatin1(cerr), - type, mysql_errno(p->mysql)); + type, QString::number(mysql_errno(p->mysql))); } @@ -349,7 +349,7 @@ static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type, const char *cerr = mysql_stmt_error(stmt); return QSqlError(QLatin1String("QMYSQL3: ") + err, QString::fromLatin1(cerr), - type, mysql_stmt_errno(stmt)); + type, QString::number(mysql_stmt_errno(stmt))); } static bool qIsBlob(int t) diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 2d16c3d60c..272e1bc083 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -644,7 +644,8 @@ QSqlError qMakeError(const QString& errString, QSqlError::ErrorType type, OCIErr { int errorCode = 0; const QString oraErrorString = qOraWarn(err, &errorCode); - return QSqlError(errString, oraErrorString, type, errorCode); + return QSqlError(errString, oraErrorString, type, + errorCode != -1 ? QString::number(errorCode) : QString()); } QVariant::Type qDecodeOCIType(const QString& ocitype, QSql::NumericalPrecisionPolicy precisionPolicy) diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 4a4183c7a3..547eb2043d 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -335,7 +335,8 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, nativeCode); + return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + nativeCode != -1 ? QString::number(nativeCode) : QString()); } static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, @@ -343,7 +344,8 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, nativeCode); + return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, + nativeCode != -1 ? QString::number(nativeCode) : QString()); } static QVariant::Type qDecodeODBCType(SQLSMALLINT sqltype, bool isSigned = true) diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp index 9745c5ebc6..390f05c7aa 100644 --- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp +++ b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp @@ -178,7 +178,8 @@ void QSQLite2ResultPrivate::finalize() if (err) { q->setLastError(QSqlError(QCoreApplication::translate("QSQLite2Result", "Unable to fetch results"), QString::fromLatin1(err), - QSqlError::StatementError, res)); + QSqlError::StatementError, + res != -1 ? QString::number(res) : QString())); sqlite_freemem(err); } currentMachine = 0; diff --git a/src/plugins/sqldrivers/tds/qsql_tds.cpp b/src/plugins/sqldrivers/tds/qsql_tds.cpp index 5fc34da407..ad95b097ef 100644 --- a/src/plugins/sqldrivers/tds/qsql_tds.cpp +++ b/src/plugins/sqldrivers/tds/qsql_tds.cpp @@ -132,7 +132,8 @@ QT_BEGIN_NAMESPACE QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, int errNo = -1) { - return QSqlError(QLatin1String("QTDS: ") + err, QString(), type, errNo); + return QSqlError(QLatin1String("QTDS: ") + err, QString(), type, + errNo != -1 ? QString::number(errNo) : QString()); } class QTDSDriverPrivate : public QSqlDriverPrivate -- cgit v1.2.3