whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSystemLocalePrivate::substituteDigits(): change to move semantics 

Rather than passing an in-out reference parameter and ignoring the
return (of that parameter) use an actual rvalue ref parameter and move
the value through the function, to make it easier for compilers to
see how to optimize it.

Change-Id: Ie239400345da012d8fb8a731394f1687b8b62430
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Edward Welbourne 2020-07-14 13:59:40 +02:00
parent b5bc3ee036
commit 7ec5cba6de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/text/qlocale_win.cpp
View File

@ -133,7 +133,7 @@ private:
int getTimeFormat(DWORD flags, const SYSTEMTIME *date, LPCWSTR format, LPWSTR data, int size);
SubstitutionType substitution();
QString &substituteDigits(QString &string);
QString substituteDigits(QString &&string);
static QString winToQtFormat(QStringView sys_fmt);
@ -230,7 +230,7 @@ QSystemLocalePrivate::SubstitutionType QSystemLocalePrivate::substitution()
return substitutionType;
}
QString &QSystemLocalePrivate::substituteDigits(QString &string)
QString QSystemLocalePrivate::substituteDigits(QString &&string)
{
zeroDigit(); // Ensure zero is set.
switch (zero.size()) {
@ -261,7 +261,7 @@ QString &QSystemLocalePrivate::substituteDigits(QString &string)
case 0: // Apparently this locale info was not available.
break;
}
return string;
return std::move(string);
}
QVariant QSystemLocalePrivate::zeroDigit()
@ -400,7 +400,7 @@ QVariant QSystemLocalePrivate::toString(QDate date, QLocale::FormatType type)
if (getDateFormat(flags, &st, NULL, buf, 255)) {
QString format = QString::fromWCharArray(buf);
if (substitution() == SAlways)
substituteDigits(format);
format = substituteDigits(std::move(format));
return format;
}
return QString();
@ -424,7 +424,7 @@ QVariant QSystemLocalePrivate::toString(QTime time, QLocale::FormatType type)
if (getTimeFormat(flags, &st, NULL, buf, 255)) {
QString format = QString::fromWCharArray(buf);
if (substitution() == SAlways)
substituteDigits(format);
format = substituteDigits(std::move(format));
return format;
}
return QString();
@ -585,7 +585,7 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS
value = QString::fromWCharArray(out.data());
if (substitution() == SAlways)
substituteDigits( value);
value = substituteDigits(std::move(value));
return value;
}