whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <andy.shaw@qt.io>
bb10
Friedemann Kleint 2018-01-09 17:17:57 +01:00
parent 344acfb9fe
commit 8247ce9766
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -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;
}

4
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -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)

3
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -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)

6
src/plugins/sqldrivers/odbc/qsql_odbc.cpp
View File

@ -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)

3
src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
View File

@ -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;

3
src/plugins/sqldrivers/tds/qsql_tds.cpp
View File

@ -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