diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-29 18:06:50 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-05-29 18:24:30 +0200 |
| commit | 090085e1040110ca6ae09956db8bf8e69a268eef (patch) | |
| tree | 0e47ea8875e9cbe078094cfbbf9ee6d5e004ca9c /src/corelib/tools/qcommandlineparser.cpp | |
| parent | 41fa84c0d803324d24605d91c2bcd28f8217a4d5 (diff) | |
corelib/tools: use qUtf16Printable() and %ls
... instead of qPrintable() and %s. Saves temporary QByteArray creation.
Change-Id: Idd46c99a5da731e29c6d237dc914e256ac7b3fbd
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qcommandlineparser.cpp')
| -rw-r--r-- | src/corelib/tools/qcommandlineparser.cpp | 8 |
1 files changed, 4 insertions, 4 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(); } |