diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-05 11:53:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 11:24:20 +0200 |
| commit | 11f80c022fcf6cce17bab95906bd8fc7e5c09747 (patch) | |
| tree | f26f166dacf26f1bc043611950d0808dc6573268 /src/corelib/codecs | |
| parent | 8f114af67bc0552371bb9c5464eb448060f99446 (diff) | |
Remove duplicate check in utf endian detection
This was excessive paranoia.
Task-number: QTBUG-20482
Change-Id: Ia0c76651773e12f25ec5d62675d6f317b8d2df13
Reviewed-on: http://codereview.qt-project.org/6045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qutfcodec.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index aaebec3c25..34e4695a26 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -468,20 +468,18 @@ QString QUtf32::convertToUnicode(const char *chars, int len, QTextCodec::Convert if (num == 4) { if (!headerdone) { if (endian == DetectEndianness) { - if (endian == DetectEndianness) { - if (tuple[0] == 0xff && tuple[1] == 0xfe && tuple[2] == 0 && tuple[3] == 0 && endian != BigEndianness) { - endian = LittleEndianness; - num = 0; - continue; - } else if (tuple[0] == 0 && tuple[1] == 0 && tuple[2] == 0xfe && tuple[3] == 0xff && endian != LittleEndianness) { - endian = BigEndianness; - num = 0; - continue; - } else if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { - endian = BigEndianness; - } else { - endian = LittleEndianness; - } + if (tuple[0] == 0xff && tuple[1] == 0xfe && tuple[2] == 0 && tuple[3] == 0 && endian != BigEndianness) { + endian = LittleEndianness; + num = 0; + continue; + } else if (tuple[0] == 0 && tuple[1] == 0 && tuple[2] == 0xfe && tuple[3] == 0xff && endian != LittleEndianness) { + endian = BigEndianness; + num = 0; + continue; + } else if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + endian = BigEndianness; + } else { + endian = LittleEndianness; } } else if (((endian == BigEndianness) ? qFromBigEndian<quint32>(tuple) : qFromLittleEndian<quint32>(tuple)) == QChar::ByteOrderMark) { num = 0; |