From e201d585401ea4affe8dde3f4f43f15bf49fa229 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 12 May 2020 15:46:07 +0200 Subject: [PATCH] QString: fix premature pessimisation in arg(char-ish) Instead of converting the char or QChar to a QString, convert them to a QStringView, saving the memory allocation. Pick-to: 5.15 Change-Id: I023712ec00172f1c8570e762817bfc3a95e01125 Reviewed-by: Lars Knoll --- src/corelib/text/qstring.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index c74a9296dc..5ee4102cdb 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -8684,9 +8684,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, QChar fillChar) con */ QString QString::arg(QChar a, int fieldWidth, QChar fillChar) const { - QString c; - c += a; - return arg(c, fieldWidth, fillChar); + return arg(QStringView{&a, 1}, fieldWidth, fillChar); } /*! @@ -8696,9 +8694,7 @@ QString QString::arg(QChar a, int fieldWidth, QChar fillChar) const */ QString QString::arg(char a, int fieldWidth, QChar fillChar) const { - QString c; - c += QLatin1Char(a); - return arg(c, fieldWidth, fillChar); + return arg(QLatin1Char(a), fieldWidth, fillChar); } /*!