diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2019-03-27 11:18:37 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-06-28 23:05:29 -0700 |
commit | a39b19b0c7419021b3c22dc4d4bced0995f3a29f (patch) | |
tree | a767defb4d74ee22aea5b73e3f2d47edb9e37bd4 /src/corelib/kernel | |
parent | 227c1a56ecb8b99cbd64bd6b8335b3cc3c8a21f1 (diff) |
QTranslator: simplify QString byte-swapping code
No need to check QSysInfo, just use qFromBigEndian. On big-endian
systems, it does the memcpy for us.
Change-Id: I1004b4b819774c4c9296fffd158fe3aa5ff0a287
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index dc0ab9f08a..637ef84d21 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -948,11 +948,8 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context, end: if (!tn) return QString(); - QString str = QString((const QChar *)tn, tn_length/2); - if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { - QChar *data = str.data(); - qbswap<sizeof(QChar)>(data, str.length(), data); - } + QString str(tn_length / 2, Qt::Uninitialized); + qFromBigEndian<ushort>(tn, str.length(), str.data()); return str; } |