report function name from qt_initLocale(), qt_u_strToUpper() and qt_u_strToLower() warnings

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-08 15:09:58 +00:00
parent d32ec4c47c
commit f3fba4727f

View file

@ -275,7 +275,7 @@ double qstrtod(const char *s00, const char **se, bool *ok)
/****************************************************************************** /******************************************************************************
** Helpers string casing and collation ** Helpers for string casing and collation
*/ */
static UCollator *icuCollator = Q_NULLPTR; static UCollator *icuCollator = Q_NULLPTR;
@ -290,7 +290,7 @@ bool qt_initLocale(const QString &locale)
icuCollator = ucol_open(locale.toLatin1().constData(), &error); icuCollator = ucol_open(locale.toLatin1().constData(), &error);
if (Q_UNLIKELY(U_FAILURE(error))) { if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("ucol_open(%s) failed %s", qWarning("qt_initLocale: ucol_open(%s) failed %s",
locale.toLatin1().constData(), u_errorName(error)); locale.toLatin1().constData(), u_errorName(error));
return false; return false;
} }
@ -323,7 +323,7 @@ bool qt_u_strToUpper(const QString &str, QString *out, const QLocale &locale)
reinterpret_cast<const UChar*>(str.unicode()), str.size(), reinterpret_cast<const UChar*>(str.unicode()), str.size(),
locale.bcp47Name().toLatin1().constData(), &error); locale.bcp47Name().toLatin1().constData(), &error);
if (Q_UNLIKELY(U_FAILURE(error))) { if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("u_strToUpper(%s) failed %s", qWarning("qt_u_strToUpper: u_strToUpper(%s) failed %s",
locale.bcp47Name().toLatin1().constData(), u_errorName(error)); locale.bcp47Name().toLatin1().constData(), u_errorName(error));
out->clear(); out->clear();
return false; return false;
@ -343,7 +343,7 @@ bool qt_u_strToLower(const QString &str, QString *out, const QLocale &locale)
reinterpret_cast<const UChar*>(str.unicode()), str.size(), reinterpret_cast<const UChar*>(str.unicode()), str.size(),
locale.bcp47Name().toLatin1().constData(), &error); locale.bcp47Name().toLatin1().constData(), &error);
if (Q_UNLIKELY(U_FAILURE(error))) { if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("u_strToLower(%s) failed %s", qWarning("qt_u_strToLower: u_strToLower(%s) failed %s",
locale.bcp47Name().toLatin1().constData(), u_errorName(error)); locale.bcp47Name().toLatin1().constData(), u_errorName(error));
out->clear(); out->clear();
return false; return false;