1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTranslator: simplify QString byte-swapping code

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2019-03-27 11:18:37 -07:00
parent 227c1a56ec
commit a39b19b0c7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/kernel/qtranslator.cpp
View File

@ -948,11 +948,8 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
end: end:
if (!tn) if (!tn)
return QString(); return QString();
QString str = QString((const QChar *)tn, tn_length/2); QString str(tn_length / 2, Qt::Uninitialized);
if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { qFromBigEndian<ushort>(tn, str.length(), str.data());
QChar *data = str.data();
qbswap<sizeof(QChar)>(data, str.length(), data);
}
return str; return str;
} }