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

qlocale_win: Rename a misnamed local variable

Browse Source 
Although the function is called get{Dat,Tim}eFormat(), the content
it's filling the buffer with isn't a format, it's a formatted date or
time. So name the variable we transcribe the buffer into text instead
of misleadingly calling it format.

Change-Id: Ia3a51184963109a50dbc41e205bd8c83d83c04d7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2021-08-06 12:26:23 +02:00
parent 6f8ef8c64d
commit f5aeb4f970
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

@ -399,10 +399,10 @@ QVariant QSystemLocalePrivate::toString(QDate date, QLocale::FormatType type)
DWORD flags = (type == QLocale::LongFormat ? DATE_LONGDATE : DATE_SHORTDATE); DWORD flags = (type == QLocale::LongFormat ? DATE_LONGDATE : DATE_SHORTDATE);
wchar_t buf[255]; wchar_t buf[255];
if (getDateFormat(flags, &st, NULL, buf, 255)) { if (getDateFormat(flags, &st, NULL, buf, 255)) {
QString format = QString::fromWCharArray(buf); QString text = QString::fromWCharArray(buf);
if (substitution() == SAlways) if (substitution() == SAlways)
format = substituteDigits(std::move(format)); text = substituteDigits(std::move(text));
return format; return text;
} }
return QString(); return QString();
} }
@ -422,10 +422,10 @@ QVariant QSystemLocalePrivate::toString(QTime time, QLocale::FormatType type)
wchar_t buf[255]; wchar_t buf[255];
if (getTimeFormat(flags, &st, NULL, buf, 255)) { if (getTimeFormat(flags, &st, NULL, buf, 255)) {
QString format = QString::fromWCharArray(buf); QString text = QString::fromWCharArray(buf);
if (substitution() == SAlways) if (substitution() == SAlways)
format = substituteDigits(std::move(format)); text = substituteDigits(std::move(text));
return format; return text;
} }
return QString(); return QString();
} }