From 090085e1040110ca6ae09956db8bf8e69a268eef Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 29 May 2019 18:06:50 +0200 Subject: [PATCH] corelib/tools: use qUtf16Printable() and %ls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... instead of qPrintable() and %s. Saves temporary QByteArray creation. Change-Id: Idd46c99a5da731e29c6d237dc914e256ac7b3fbd Reviewed-by: Mårten Nordheim Reviewed-by: Thiago Macieira --- src/corelib/tools/qcommandlineparser.cpp | 8 ++++---- src/corelib/tools/qhash.cpp | 2 +- src/corelib/tools/qlocale_mac.mm | 4 ++-- src/corelib/tools/qregularexpression.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index b62cc930cb..48501f5271 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -132,7 +132,7 @@ QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const { const NameHash_t::const_iterator it = nameHash.constFind(optionName); if (it == nameHash.cend()) { - qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); + qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName)); return QStringList(); } return commandLineOptionList.at(*it).names(); @@ -560,9 +560,9 @@ static void showParserMessage(const QString &message, MessageType type) { #if defined(Q_OS_WINRT) if (type == UsageMessage) - qInfo(qPrintable(message)); + qInfo("%ls", qUtf16Printable(message)); else - qCritical(qPrintable(message)); + qCritical("%ls", qUtf16Printable(message)); return; #elif defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) if (displayMessageBox()) { @@ -898,7 +898,7 @@ QStringList QCommandLineParser::values(const QString &optionName) const return values; } - qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); + qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName)); return QStringList(); } diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 5c7e535c30..85a3456d71 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -709,7 +709,7 @@ void QHashData::dump() } n = n->next; } - qDebug("%s", qPrintable(line)); + qDebug("%ls", qUtf16Printable(line)); } } } diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 6c721480f3..9719278426 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -489,8 +489,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const } else if (typeId == CFStringGetTypeID()) { result = QStringList(QString::fromCFString(languages.as())); } else { - qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt.io", - qPrintable(QString::fromCFString(CFCopyTypeIDDescription(typeId)))); + qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%ls\"; please report to http://bugreports.qt.io", + qUtf16Printable(QString::fromCFString(CFCopyTypeIDDescription(typeId)))); } return QVariant(result); } diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index ca1a866842..9c201e770b 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -1048,8 +1048,8 @@ void QRegularExpressionPrivate::getPatternInfo() unsigned int hasJOptionChanged; pcre2_pattern_info_16(compiledPattern, PCRE2_INFO_JCHANGED, &hasJOptionChanged); if (Q_UNLIKELY(hasJOptionChanged)) { - qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%s'\n is using the (?J) option; duplicate capturing group names are not supported by Qt", - qPrintable(pattern)); + qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%ls'\n is using the (?J) option; duplicate capturing group names are not supported by Qt", + qUtf16Printable(pattern)); } }