AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Micro-optimize QXmlStreamReaderPrivate.

Browse Source 
Avoid redundant QStringRef to QString conversions.

Change-Id: I4a65119e7821206e2f72387a5d02cec5ce39dbfb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Jędrzej Nowacki 2014-07-30 10:50:11 +02:00
parent f5c3126201
commit 2eea6034bc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/xml/qxmlstream.cpp
View File

@ -1711,9 +1711,9 @@ uint QXmlStreamReaderPrivate::resolveCharRef(int symbolIndex)
uint s;
// ### add toXShort to QStringRef?
if (sym(symbolIndex).c == 'x')
s = symString(symbolIndex, 1).toString().toUInt(&ok, 16);
s = symString(symbolIndex, 1).toUInt(&ok, 16);
else
s = symString(symbolIndex).toString().toUInt(&ok, 10);
s = symString(symbolIndex).toUInt(&ok, 10);
ok &= (s == 0x9 || s == 0xa || s == 0xd || (s >= 0x20 && s <= 0xd7ff)
|| (s >= 0xe000 && s <= 0xfffd) || (s >= 0x10000 && s <= QChar::LastValidCodePoint));
@ -1773,7 +1773,7 @@ void QXmlStreamReaderPrivate::startDocument()
{
QString err;
if (documentVersion != QLatin1String("1.0")) {
if (documentVersion.toString().contains(QLatin1Char(' ')))
if (documentVersion.contains(QLatin1Char(' ')))
err = QXmlStream::tr("Invalid XML version string.");
else
err = QXmlStream::tr("Unsupported XML version.");