diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-16 17:23:18 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-16 18:10:38 (GMT) |
| commit | d590fc729e3afaedf181da58f8b685d7597040da (patch) | |
| tree | 446692610d5d85733074042115118a556f39c0e3 /src/sql/drivers/odbc | |
| parent | e6b629f3ebc1d530218f01a735275e56bf474a18 (diff) | |
| download | Qt-d590fc729e3afaedf181da58f8b685d7597040da.zip Qt-d590fc729e3afaedf181da58f8b685d7597040da.tar.gz Qt-d590fc729e3afaedf181da58f8b685d7597040da.tar.bz2 | |
optimization: get rid of QString::fromUtf16() usage, part 2
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly irrelevant when converting internal data
structures which are raw utf16 in host byte order. so replace it with
QString::fromUnicode() where possible (which seems to be everywhere).
the reasoning is the same as in commit e0fda52f, so not getting further
reviews.
Reviewed-by: denis
Reviewed-by: joao
Diffstat (limited to 'src/sql/drivers/odbc')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 18bc743..fab3ab3 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1558,7 +1558,7 @@ bool QODBCResult::exec() case QVariant::String: if (d->unicode) { if (bindValueType(i) & QSql::Out) - values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData()); + values[i] = QString((QChar *)tmpStorage.takeFirst().constData()); break; } // fall through |