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

Replace QString::trimmed() with QStringRef::trimmed()

Browse Source 
... where it's possible. Reduce allocations.

Change-Id: I023adfd316f94948fe50749f60bf55748dca56e2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Anton Kudryavtsev 2016-07-05 16:25:40 +03:00
parent 802c31bdbd
commit 5dc739ba9b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/text/qtexthtmlparser.cpp
View File

@ -1418,16 +1418,16 @@ static bool setFloatAttribute(qreal *destination, const QString &value)
return ok; return ok;
} }
static void setWidthAttribute(QTextLength *width, QString value) static void setWidthAttribute(QTextLength *width, const QString &valueStr)
{ {
bool ok = false; bool ok = false;
qreal realVal = value.toDouble(&ok); qreal realVal = valueStr.toDouble(&ok);
if (ok) { if (ok) {
*width = QTextLength(QTextLength::FixedLength, realVal); *width = QTextLength(QTextLength::FixedLength, realVal);
} else { } else {
value = value.trimmed(); QStringRef value = QStringRef(&valueStr).trimmed();
if (!value.isEmpty() && value.endsWith(QLatin1Char('%'))) { if (!value.isEmpty() && value.endsWith(QLatin1Char('%'))) {
value.chop(1); value.truncate(value.size() - 1);
realVal = value.toDouble(&ok); realVal = value.toDouble(&ok);
if (ok) if (ok)
*width = QTextLength(QTextLength::PercentageLength, realVal); *width = QTextLength(QTextLength::PercentageLength, realVal);

6
src/network/access/qftp.cpp
View File

@ -2034,7 +2034,7 @@ int QFtp::rename(const QString &oldname, const QString &newname)
*/ */
int QFtp::rawCommand(const QString &command) int QFtp::rawCommand(const QString &command)
{ {
QString cmd = command.trimmed() + QLatin1String("\r\n"); const QString cmd = QStringRef(&command).trimmed() + QLatin1String("\r\n");
return d_func()->addCommand(new QFtpCommand(RawCommand, QStringList(cmd))); return d_func()->addCommand(new QFtpCommand(RawCommand, QStringList(cmd)));
} }
@ -2253,8 +2253,8 @@ void QFtpPrivate::_q_startNextCommand()
// Proxy support, replace the Login argument in place, then fall // Proxy support, replace the Login argument in place, then fall
// through. // through.
if (c->command == QFtp::Login && !proxyHost.isEmpty()) { if (c->command == QFtp::Login && !proxyHost.isEmpty()) {
QString loginString = c->rawCmds.constFirst().trimmed(); QString loginString;
loginString += QLatin1Char('@') + host; loginString += QStringRef(&c->rawCmds.constFirst()).trimmed() + QLatin1Char('@') + host;
if (port && port != 21) if (port && port != 21)
loginString += QLatin1Char(':') + QString::number(port); loginString += QLatin1Char(':') + QString::number(port);
loginString += QLatin1String("\r\n"); loginString += QLatin1String("\r\n");