From f3fba4727f4b6ee51afd3fa1dfcfcb2d93ccbab3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 8 Dec 2019 15:09:58 +0000 Subject: [PATCH] report function name from qt_initLocale(), qt_u_strToUpper() and qt_u_strToLower() warnings Signed-off-by: Ivailo Monev --- src/core/tools/qlocale_tools.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/tools/qlocale_tools.cpp b/src/core/tools/qlocale_tools.cpp index 9d833af73..5c43148d4 100644 --- a/src/core/tools/qlocale_tools.cpp +++ b/src/core/tools/qlocale_tools.cpp @@ -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; @@ -290,7 +290,7 @@ bool qt_initLocale(const QString &locale) icuCollator = ucol_open(locale.toLatin1().constData(), &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)); return false; } @@ -323,7 +323,7 @@ bool qt_u_strToUpper(const QString &str, QString *out, const QLocale &locale) reinterpret_cast(str.unicode()), str.size(), locale.bcp47Name().toLatin1().constData(), &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)); out->clear(); return false; @@ -343,7 +343,7 @@ bool qt_u_strToLower(const QString &str, QString *out, const QLocale &locale) reinterpret_cast(str.unicode()), str.size(), locale.bcp47Name().toLatin1().constData(), &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)); out->clear(); return false;