AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify qlocale_win's getLocaleInfo() and its _int variant

Browse Source 
One of the former's overloads was a template; it and its _int variant
took an optional maxlen; no caller passed maxlen, only three callers
didn't over-ride the template's <QString> default return value to
<QVariant>; so eliminate maxlen and have it simply return QVariant,
using .toString() on it where needed.

Change-Id: Icf3ff32f167ee96cfbb6412613ecd7f0886a2fe9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-07-03 12:13:35 +02:00
parent e91b778395
commit d0806bf26a
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,10 +125,8 @@ private:
QString zero; // cached value for zeroDigit() QString zero; // cached value for zeroDigit()
int getLocaleInfo(LCTYPE type, LPWSTR data, int size); int getLocaleInfo(LCTYPE type, LPWSTR data, int size);
// Need to distinguish empty QString packaged as (non-null) QVariant from null QVariant: QVariant getLocaleInfo(LCTYPE type);
template <typename T = QString> int getLocaleInfo_int(LCTYPE type);
T getLocaleInfo(LCTYPE type, int maxlen = 0);
int getLocaleInfo_int(LCTYPE type, int maxlen = 0);
int getCurrencyFormat(DWORD flags, LPCWSTR value, const CURRENCYFMTW *format, LPWSTR data, int size); int getCurrencyFormat(DWORD flags, LPCWSTR value, const CURRENCYFMTW *format, LPWSTR data, int size);
int getDateFormat(DWORD flags, const SYSTEMTIME * date, LPCWSTR format, LPWSTR data, int size); int getDateFormat(DWORD flags, const SYSTEMTIME * date, LPCWSTR format, LPWSTR data, int size);
@ -168,15 +166,15 @@ inline int QSystemLocalePrivate::getLocaleInfo(LCTYPE type, LPWSTR data, int siz
return GetLocaleInfo(lcid, type, data, size); return GetLocaleInfo(lcid, type, data, size);
} }
template<typename T> QVariant QSystemLocalePrivate::getLocaleInfo(LCTYPE type)
T QSystemLocalePrivate::getLocaleInfo(LCTYPE type, int maxlen)
{ {
// https://docs.microsoft.com/en-us/windows/win32/intl/locale-spositivesign // https://docs.microsoft.com/en-us/windows/win32/intl/locale-spositivesign
// says empty for LOCALE_SPOSITIVESIGN means "+", although GetLocaleInfo() // says empty for LOCALE_SPOSITIVESIGN means "+", although GetLocaleInfo()
// is documented to return 0 only on failure, so it's not clear how it // is documented to return 0 only on failure, so it's not clear how it
// returns empty to mean this; hence the two checks for it below. // returns empty to mean this; hence the two checks for it below.
const QString plus = QStringLiteral("+"); const QString plus = QStringLiteral("+");
QVarLengthArray<wchar_t, 64> buf(maxlen ? maxlen : 64); QVarLengthArray<wchar_t, 64> buf(64);
// Need to distinguish empty QString packaged as (non-null) QVariant from null QVariant:
if (!getLocaleInfo(type, buf.data(), buf.size())) { if (!getLocaleInfo(type, buf.data(), buf.size())) {
const auto lastError = GetLastError(); const auto lastError = GetLastError();
if (type == LOCALE_SPOSITIVESIGN && lastError == ERROR_SUCCESS) if (type == LOCALE_SPOSITIVESIGN && lastError == ERROR_SUCCESS)
@ -195,11 +193,11 @@ T QSystemLocalePrivate::getLocaleInfo(LCTYPE type, int maxlen)
return QString::fromWCharArray(buf.data()); return QString::fromWCharArray(buf.data());
} }
int QSystemLocalePrivate::getLocaleInfo_int(LCTYPE type, int maxlen) int QSystemLocalePrivate::getLocaleInfo_int(LCTYPE type)
{ {
QString str = getLocaleInfo(type, maxlen); const QString str = getLocaleInfo(type).toString();
bool ok = false; bool ok = false;
int v = str.toInt(&ok); const int v = str.toInt(&ok);
return ok ? v : 0; return ok ? v : 0;
} }
@ -287,31 +285,31 @@ QVariant QSystemLocalePrivate::zeroDigit()
QVariant QSystemLocalePrivate::decimalPoint() QVariant QSystemLocalePrivate::decimalPoint()
{ {
return getLocaleInfo<QVariant>(LOCALE_SDECIMAL); return getLocaleInfo(LOCALE_SDECIMAL);
} }
QVariant QSystemLocalePrivate::groupSeparator() QVariant QSystemLocalePrivate::groupSeparator()
{ {
return getLocaleInfo<QVariant>(LOCALE_STHOUSAND); return getLocaleInfo(LOCALE_STHOUSAND);
} }
QVariant QSystemLocalePrivate::negativeSign() QVariant QSystemLocalePrivate::negativeSign()
{ {
return getLocaleInfo<QVariant>(LOCALE_SNEGATIVESIGN); return getLocaleInfo(LOCALE_SNEGATIVESIGN);
} }
QVariant QSystemLocalePrivate::positiveSign() QVariant QSystemLocalePrivate::positiveSign()
{ {
return getLocaleInfo<QVariant>(LOCALE_SPOSITIVESIGN); return getLocaleInfo(LOCALE_SPOSITIVESIGN);
} }
QVariant QSystemLocalePrivate::dateFormat(QLocale::FormatType type) QVariant QSystemLocalePrivate::dateFormat(QLocale::FormatType type)
{ {
switch (type) { switch (type) {
case QLocale::ShortFormat: case QLocale::ShortFormat:
return winToQtFormat(getLocaleInfo(LOCALE_SSHORTDATE)); return winToQtFormat(getLocaleInfo(LOCALE_SSHORTDATE).toString());
case QLocale::LongFormat: case QLocale::LongFormat:
return winToQtFormat(getLocaleInfo(LOCALE_SLONGDATE)); return winToQtFormat(getLocaleInfo(LOCALE_SLONGDATE).toString());
case QLocale::NarrowFormat: case QLocale::NarrowFormat:
break; break;
} }
@ -322,9 +320,9 @@ QVariant QSystemLocalePrivate::timeFormat(QLocale::FormatType type)
{ {
switch (type) { switch (type) {
case QLocale::ShortFormat: case QLocale::ShortFormat:
return winToQtFormat(getLocaleInfo(LOCALE_SSHORTTIME)); return winToQtFormat(getLocaleInfo(LOCALE_SSHORTTIME).toString());
case QLocale::LongFormat: case QLocale::LongFormat:
return winToQtFormat(getLocaleInfo(LOCALE_STIMEFORMAT)); return winToQtFormat(getLocaleInfo(LOCALE_STIMEFORMAT).toString());
case QLocale::NarrowFormat: case QLocale::NarrowFormat:
break; break;
} }
@ -360,10 +358,10 @@ QVariant QSystemLocalePrivate::dayName(int day, QLocale::FormatType type)
day -= 1; day -= 1;
if (type == QLocale::LongFormat) if (type == QLocale::LongFormat)
return getLocaleInfo<QVariant>(long_day_map[day]); return getLocaleInfo(long_day_map[day]);
if (type == QLocale::NarrowFormat) if (type == QLocale::NarrowFormat)
return getLocaleInfo<QVariant>(narrow_day_map[day]); return getLocaleInfo(narrow_day_map[day]);
return getLocaleInfo<QVariant>(short_day_map[day]); return getLocaleInfo(short_day_map[day]);
} }
QVariant QSystemLocalePrivate::monthName(int month, QLocale::FormatType type) QVariant QSystemLocalePrivate::monthName(int month, QLocale::FormatType type)
@ -386,7 +384,7 @@ QVariant QSystemLocalePrivate::monthName(int month, QLocale::FormatType type)
LCTYPE lctype = (type == QLocale::ShortFormat || type == QLocale::NarrowFormat) LCTYPE lctype = (type == QLocale::ShortFormat || type == QLocale::NarrowFormat)
? short_month_map[month] : long_month_map[month]; ? short_month_map[month] : long_month_map[month];
return getLocaleInfo<QVariant>(lctype); return getLocaleInfo(lctype);
} }
QVariant QSystemLocalePrivate::toString(QDate date, QLocale::FormatType type) QVariant QSystemLocalePrivate::toString(QDate date, QLocale::FormatType type)
@ -453,16 +451,15 @@ QVariant QSystemLocalePrivate::measurementSystem()
QVariant QSystemLocalePrivate::collation() QVariant QSystemLocalePrivate::collation()
{ {
return getLocaleInfo<QVariant>(LOCALE_SSORTLOCALE); return getLocaleInfo(LOCALE_SSORTLOCALE);
} }
QVariant QSystemLocalePrivate::amText() QVariant QSystemLocalePrivate::amText()
{ {
wchar_t output[15]; // maximum length including terminating zero character for Win2003+ wchar_t output[15]; // maximum length including terminating zero character for Win2003+
if (getLocaleInfo(LOCALE_S1159, output, 15)) { if (getLocaleInfo(LOCALE_S1159, output, 15))
return QString::fromWCharArray(output); return QString::fromWCharArray(output);
}
return QVariant(); return QVariant();
} }
@ -471,9 +468,8 @@ QVariant QSystemLocalePrivate::pmText()
{ {
wchar_t output[15]; // maximum length including terminating zero character for Win2003+ wchar_t output[15]; // maximum length including terminating zero character for Win2003+
if (getLocaleInfo(LOCALE_S2359, output, 15)) { if (getLocaleInfo(LOCALE_S2359, output, 15))
return QString::fromWCharArray(output); return QString::fromWCharArray(output);
}
return QVariant(); return QVariant();
} }
@ -554,9 +550,9 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS
if (!arg.symbol.isEmpty()) { if (!arg.symbol.isEmpty()) {
format.NumDigits = getLocaleInfo_int(LOCALE_ICURRDIGITS); format.NumDigits = getLocaleInfo_int(LOCALE_ICURRDIGITS);
format.LeadingZero = getLocaleInfo_int(LOCALE_ILZERO); format.LeadingZero = getLocaleInfo_int(LOCALE_ILZERO);
decimalSep = getLocaleInfo(LOCALE_SMONDECIMALSEP); decimalSep = getLocaleInfo(LOCALE_SMONDECIMALSEP).toString();
format.lpDecimalSep = (wchar_t *)decimalSep.utf16(); format.lpDecimalSep = (wchar_t *)decimalSep.utf16();
thousandSep = getLocaleInfo(LOCALE_SMONTHOUSANDSEP); thousandSep = getLocaleInfo(LOCALE_SMONTHOUSANDSEP).toString();
format.lpThousandSep = (wchar_t *)thousandSep.utf16(); format.lpThousandSep = (wchar_t *)thousandSep.utf16();
format.NegativeOrder = getLocaleInfo_int(LOCALE_INEGCURR); format.NegativeOrder = getLocaleInfo_int(LOCALE_INEGCURR);
format.PositiveOrder = getLocaleInfo_int(LOCALE_ICURRENCY); format.PositiveOrder = getLocaleInfo_int(LOCALE_ICURRENCY);
@ -568,7 +564,7 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS
// int(30) == "123456,789.00" == string("3;0;0") // int(30) == "123456,789.00" == string("3;0;0")
// int(32) == "12,34,56,789.00" == string("3;2;0") // int(32) == "12,34,56,789.00" == string("3;2;0")
// int(320)== "1234,56,789.00" == string("3;2") // int(320)== "1234,56,789.00" == string("3;2")
QString groupingStr = getLocaleInfo(LOCALE_SMONGROUPING); QString groupingStr = getLocaleInfo(LOCALE_SMONGROUPING).toString();
format.Grouping = groupingStr.remove(QLatin1Char(';')).toInt(); format.Grouping = groupingStr.remove(QLatin1Char(';')).toInt();
if (format.Grouping % 10 == 0) // magic if (format.Grouping % 10 == 0) // magic
format.Grouping /= 10; format.Grouping /= 10;
@ -624,12 +620,12 @@ QVariant QSystemLocalePrivate::uiLanguages()
QVariant QSystemLocalePrivate::nativeLanguageName() QVariant QSystemLocalePrivate::nativeLanguageName()
{ {
return getLocaleInfo<QVariant>(LOCALE_SNATIVELANGUAGENAME); return getLocaleInfo(LOCALE_SNATIVELANGUAGENAME);
} }
QVariant QSystemLocalePrivate::nativeCountryName() QVariant QSystemLocalePrivate::nativeCountryName()
{ {
return getLocaleInfo<QVariant>(LOCALE_SNATIVECOUNTRYNAME); return getLocaleInfo(LOCALE_SNATIVECOUNTRYNAME);
} }