From 215bda50f959673f076fe76cf1f95a2a5f759b2c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 28 Feb 2015 15:18:39 +0100 Subject: [PATCH] QtGui: replace QStringLiteral with QLatin1String when appending It makes little sense to use QStringLiteral for strings which are immediately appended to, or which are appended to other strings, because no dynamic memory allocation is saved by doing so. But if the only advantage of QStringLiteral does not apply, all its disadvantages dominate, to wit: injection of calls to qstring dtor, non-sharability of data between C strings and QStringLiterals and among QStringLiterals, and doubled storage requirements. Fix by replacing QStringLiteral with QLatin1String. Saves 104B in text size on stripped optimized Linux AMD64 GCC 4.9 builds. Change-Id: I36b6a9bb1963b69361cc3a3db0971e1db92f0080 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/gui/kernel/qplatformdialoghelper.cpp | 4 ++-- src/gui/util/qvalidator.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index f2a1d20d54..fe4d167078 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -258,7 +258,7 @@ void QColorDialogStaticData::readSettings() #ifndef QT_NO_SETTINGS const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); for (int i = 0; i < int(CustomColorCount); ++i) { - const QVariant v = settings.value(QStringLiteral("Qt/customColors/") + QString::number(i)); + const QVariant v = settings.value(QLatin1String("Qt/customColors/") + QString::number(i)); if (v.isValid()) customRgb[i] = v.toUInt(); } @@ -271,7 +271,7 @@ void QColorDialogStaticData::writeSettings() const if (!customSet) { QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); for (int i = 0; i < int(CustomColorCount); ++i) - settings.setValue(QStringLiteral("Qt/customColors/") + QString::number(i), customRgb[i]); + settings.setValue(QLatin1String("Qt/customColors/") + QString::number(i), customRgb[i]); } #endif } diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 430de3aef8..90c6e7a7b8 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -1066,7 +1066,7 @@ void QRegularExpressionValidatorPrivate::setRegularExpression(const QRegularExpr if (origRe != re) { usedRe = origRe = re; // copies also the pattern options - usedRe.setPattern(QStringLiteral("\\A(?:") + re.pattern() + QStringLiteral(")\\z")); + usedRe.setPattern(QLatin1String("\\A(?:") + re.pattern() + QLatin1String(")\\z")); emit q->regularExpressionChanged(re); emit q->changed(); }