diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-05 16:56:23 +0200 |
| commit | 8f32994b508bf9b59d8446c3025795acd0337ef1 (patch) | |
| tree | 28d567b6a2e6eeebdcf3e3fa330123d9b7571f9e /src/sql/drivers/tds/qsql_tds.cpp | |
| parent | ec360d7ad90945273c7d96c9a159131dcbcd67c3 (diff) | |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtSql]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: Icb3ab0e1f4f3173563f3de36115b5457cf1ba856
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql/drivers/tds/qsql_tds.cpp')
| -rw-r--r-- | src/sql/drivers/tds/qsql_tds.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index b9414499d8..f383847e7c 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -185,11 +185,11 @@ static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc, if (severity > 0) { QString errMsg = QString::fromLatin1("%1 (Msg %2, Level %3, State %4, Server %5, Line %6)") - .arg(QString::fromAscii(msgtext)) + .arg(QString::fromLatin1(msgtext)) .arg(msgno) .arg(severity) .arg(msgstate) - .arg(QString::fromAscii(srvname)) + .arg(QString::fromLatin1(srvname)) .arg(line); p->addErrorMsg(errMsg); if (severity > 10) { @@ -435,7 +435,7 @@ bool QTDSResult::reset (const QString& query) for (int i = 0; i < numCols; ++i) { int dbType = dbcoltype(d->dbproc, i+1); QVariant::Type vType = qDecodeTDSType(dbType); - QSqlField f(QString::fromAscii(dbcolname(d->dbproc, i+1)), vType); + QSqlField f(QString::fromLatin1(dbcolname(d->dbproc, i+1)), vType); f.setSqlType(dbType); f.setLength(dbcollen(d->dbproc, i+1)); d->rec.append(f); |