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

Optimize string usage

Browse Source 
Use QStringBuilder more.
Use QL1S directly, without QString construction.

Change-Id: Iad844391367681fc1013b9725403d009e7c346e6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Anton Kudryavtsev 2016-07-08 13:51:06 +03:00
parent 120ba68882
commit e46e112eb1
7 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qmetaobject.cpp
View File

@ -1353,7 +1353,7 @@ static inline QByteArray findMethodCandidates(const QMetaObject *metaObject, con
for (int i = 0; i < metaObject->methodCount(); ++i) {
const QMetaMethod method = metaObject->method(i);
if (method.name() == memberByteArray)
candidateMessage.append(" " + method.methodSignature() + '\n');
candidateMessage += " " + method.methodSignature() + '\n';
}
if (!candidateMessage.isEmpty()) {
candidateMessage.prepend("\nCandidates are:\n");

2
src/gui/text/qtextdocumentfragment.cpp
View File

@ -428,7 +428,7 @@ QTextHtmlImporter::QTextHtmlImporter(QTextDocument *_doc, const QString &_html,
QString html = _html;
const int startFragmentPos = html.indexOf(QLatin1String("<!--StartFragment-->"));
if (startFragmentPos != -1) {
QString qt3RichTextHeader(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
const QLatin1String qt3RichTextHeader("<meta name=\"qrichtext\" content=\"1\" />");
// Hack for Qt3
const bool hasQtRichtextMetaTag = html.contains(qt3RichTextHeader);

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

@ -1438,9 +1438,7 @@ static void setWidthAttribute(QTextLength *width, const QString &valueStr)
#ifndef QT_NO_CSSPARSER
void QTextHtmlParserNode::parseStyleAttribute(const QString &value, const QTextDocument *resourceProvider)
{
QString css = value;
css.prepend(QLatin1String("* {"));
css.append(QLatin1Char('}'));
const QString css = QLatin1String("* {") + value + QLatin1Char('}');
QCss::Parser parser(css);
QCss::StyleSheet sheet;
parser.parse(&sheet, Qt::CaseInsensitive);

9
src/network/access/qnetworkaccessftpbackend.cpp
View File

@ -306,8 +306,6 @@ void QNetworkAccessFtpBackend::ftpDone()
state = CheckingFeatures;
if (operation() == QNetworkAccessManager::GetOperation) {
// send help command to find out if server supports "SIZE" and "MDTM"
QString command = url().path();
command.prepend(QLatin1String("%1 "));
helpId = ftp->rawCommand(QLatin1String("HELP")); // get supported commands
} else {
ftpDone();
@ -316,14 +314,13 @@ void QNetworkAccessFtpBackend::ftpDone()
state = Statting;
if (operation() == QNetworkAccessManager::GetOperation) {
// logged in successfully, send the stat requests (if supported)
QString command = url().path();
command.prepend(QLatin1String("%1 "));
const QString path = url().path();
if (supportsSize) {
ftp->rawCommand(QLatin1String("TYPE I"));
sizeId = ftp->rawCommand(command.arg(QLatin1String("SIZE"))); // get size
sizeId = ftp->rawCommand(QLatin1String("SIZE ") + path); // get size
}
if (supportsMdtm)
mdtmId = ftp->rawCommand(command.arg(QLatin1String("MDTM"))); // get modified time
mdtmId = ftp->rawCommand(QLatin1String("MDTM ") + path); // get modified time
if (!supportsSize && !supportsMdtm)
ftpDone(); // no commands sent, move to the next state
} else {

76
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -1255,14 +1255,14 @@ void WriteInitialization::writeProperties(const QString &varName,
QString setFunction;
if (stdset) {
setFunction = QLatin1String("->set");
setFunction += propertyName.left(1).toUpper();
setFunction += propertyName.mid(1);
setFunction += QLatin1Char('(');
setFunction = QLatin1String("->set")
+ propertyName.left(1).toUpper()
+ propertyName.midRef(1)
+ QLatin1Char('(');
} else {
setFunction = QLatin1String("->setProperty(\"");
setFunction += propertyName;
setFunction += QLatin1String("\", QVariant");
setFunction += QLatin1String("->setProperty(\"")
+ propertyName
+ QLatin1String("\", QVariant");
if (p->kind() == DomProperty::Enum)
setFunction += QLatin1String("::fromValue");
setFunction += QLatin1Char('(');
@ -1286,9 +1286,9 @@ void WriteInitialization::writeProperties(const QString &varName,
if (stdset)
propertyValue = fixString(p->elementCstring(), m_dindent);
else {
propertyValue = QLatin1String("QByteArray(");
propertyValue += fixString(p->elementCstring(), m_dindent);
propertyValue += QLatin1Char(')');
propertyValue = QLatin1String("QByteArray(")
+ fixString(p->elementCstring(), m_dindent)
+ QLatin1Char(')');
}
}
break;
@ -1304,11 +1304,8 @@ void WriteInitialization::writeProperties(const QString &varName,
break;
case DomProperty::Enum:
propertyValue = p->elementEnum();
if (!propertyValue.contains(QLatin1String("::"))) {
QString scope = className;
scope += QLatin1String("::");
propertyValue.prepend(scope);
}
if (!propertyValue.contains(QLatin1String("::")))
propertyValue = className + QLatin1String("::") + propertyValue;
break;
case DomProperty::Set:
propertyValue = p->elementSet();
@ -1898,31 +1895,29 @@ QString WriteInitialization::pixCall(const QString &t, const QString &text) cons
if (m_option.extractImages) {
const QString format = image->elementData()->attributeFormat();
const QString extension = format.left(format.indexOf(QLatin1Char('.'))).toLower();
QString rc = QLatin1String("QPixmap(QString::fromUtf8(\":/");
rc += m_generatedClass;
rc += QLatin1String("/images/");
rc += text;
rc += QLatin1Char('.');
rc += extension;
rc += QLatin1String("\"))");
return rc;
return QLatin1String("QPixmap(QString::fromUtf8(\":/")
+ m_generatedClass
+ QLatin1String("/images/")
+ text
+ QLatin1Char('.')
+ extension
+ QLatin1String("\"))");
}
QString rc = WriteIconInitialization::iconFromDataFunction();
rc += QLatin1Char('(');
rc += text;
rc += QLatin1String("_ID)");
return rc;
return WriteIconInitialization::iconFromDataFunction()
+ QLatin1Char('(')
+ text
+ QLatin1String("_ID)");
}
QString pixFunc = m_uic->pixmapFunction();
if (pixFunc.isEmpty())
pixFunc = QLatin1String("QString::fromUtf8");
type += QLatin1Char('(');
type += pixFunc;
type += QLatin1Char('(');
type += fixString(text, m_dindent);
type += QLatin1String("))");
type += QLatin1Char('(')
+ pixFunc
+ QLatin1Char('(')
+ fixString(text, m_dindent)
+ QLatin1String("))");
return type;
}
@ -2316,23 +2311,20 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi
if (m_option.translateFunction.isEmpty()) {
if (m_option.idBased) {
result = QLatin1String("qtTrId(");
result += QLatin1String("qtTrId(");
} else {
result = QLatin1String("QApplication::translate(\"");
result += m_generatedClass;
result += QLatin1Char('"');
result += QLatin1String(", ");
result += QLatin1String("QApplication::translate(\"")
+ m_generatedClass
+ QLatin1String("\", ");
}
} else {
result = m_option.translateFunction;
result += QLatin1Char('(');
result += m_option.translateFunction + QLatin1Char('(');
}
result += fixString(str, m_dindent);
if (!m_option.idBased) {
result += QLatin1String(", ");
result += comment;
result += QLatin1String(", ") + comment;
}
result += QLatin1Char(')');

5
src/widgets/widgets/qspinbox.cpp
View File

@ -479,9 +479,8 @@ QString QSpinBox::textFromValue(int value) const
QString str;
if (d->displayIntegerBase != 10) {
str = QString::number(qAbs(value), d->displayIntegerBase);
if (value < 0)
str.prepend('-');
const QLatin1String prefix = value < 0 ? QLatin1String("-") : QLatin1String();
str = prefix + QString::number(qAbs(value), d->displayIntegerBase);
} else {
str = locale().toString(value);
if (!d->showGroupSeparator && (qAbs(value) >= 1000 || value == INT_MIN)) {

4
src/widgets/widgets/qwidgettextcontrol.cpp
View File

@ -2641,8 +2641,8 @@ void QWidgetTextControl::insertFromMimeData(const QMimeData *source)
#ifndef QT_NO_TEXTHTMLPARSER
if (source->hasFormat(QLatin1String("application/x-qrichtext")) && d->acceptRichText) {
// x-qrichtext is always UTF-8 (taken from Qt3 since we don't use it anymore).
QString richtext = QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
richtext.prepend(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
const QString richtext = QLatin1String("<meta name=\"qrichtext\" content=\"1\" />")
+ QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
fragment = QTextDocumentFragment::fromHtml(richtext, d->doc);
hasData = true;
} else if (source->hasHtml() && d->acceptRichText) {