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

QLocaleData: replace two static helpers with if constexpr

Browse Source 
More readable.

Change-Id: I015e5df2e67d8ca2b8eb117e2d63db8f9280a2a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-03-19 01:02:52 +02:00
parent 092563a3d0
commit b46e0b0ab2
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/text/qlocale.cpp
View File

@ -1353,26 +1353,18 @@ QString QLocale::name() const
return view + u'_' + d->territoryCode(); return view + u'_' + d->territoryCode();
} }
static qlonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool *ok,
QLocale::NumberOptions mode, qlonglong)
{
return d->stringToLongLong(str, 10, ok, mode);
}
static qulonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool *ok,
QLocale::NumberOptions mode, qulonglong)
{
return d->stringToUnsLongLong(str, 10, ok, mode);
}
template <typename T> static inline template <typename T> static inline
T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok) T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok)
{ {
using Int64 = constexpr bool isUnsigned = std::is_unsigned_v<T>;
typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; using Int64 = typename std::conditional_t<isUnsigned, quint64, qint64>;
Int64 val = 0;
if constexpr (isUnsigned)
val = d->m_data->stringToUnsLongLong(str, 10, ok, d->m_numberOptions);
else
val = d->m_data->stringToLongLong(str, 10, ok, d->m_numberOptions);
// we select the right overload by the last, unused parameter
Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64());
if (T(val) != val) { if (T(val) != val) {
if (ok != nullptr) if (ok != nullptr)
*ok = false; *ok = false;