diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 15:44:12 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-01 13:13:43 (GMT) |
| commit | e0fda52fde32458c4a42f04bd62b5e37f14c4bfd (patch) | |
| tree | df8154a8878f767c87a5cae8ad9d1dc4e17ebffd /src/gui/kernel/qdnd_x11.cpp | |
| parent | 45591e13862963fb29c13e0c5bfe39330883c579 (diff) | |
| download | Qt-e0fda52fde32458c4a42f04bd62b5e37f14c4bfd.zip Qt-e0fda52fde32458c4a42f04bd62b5e37f14c4bfd.tar.gz Qt-e0fda52fde32458c4a42f04bd62b5e37f14c4bfd.tar.bz2 | |
optimization: get rid of QString::fromUtf16() usage
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
Diffstat (limited to 'src/gui/kernel/qdnd_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qdnd_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index edab6a0..33968bd 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -617,7 +617,7 @@ QVariant QX11Data::xdndMimeConvertToFormat(Atom a, const QByteArray &data, const // so it should be safe to check that the second char is 0 // to verify that it is utf16 if (data.size() > 1 && data.at(1) == 0) - return QString::fromUtf16(reinterpret_cast<const ushort *>(data.constData()), + return QString::fromRawData((const QChar *)data.constData(), data.size() / 2).split(QLatin1Char('\n')).first().toLatin1(); } } |