From fedba8eaab464e9218afb4d11c7a77ddb5f09c40 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 13 Apr 2022 17:21:47 +0200 Subject: uic: stop using QLatin1Char constructor for creating char literals Required for porting away from QLatin1Char/QLatin1String in scope of QTBUG-98434. As a drive-by, fix qsizetype -> int narrowing conversion warnings for the touched lines. Change-Id: I0d3c232a9fa95aea854445922f100b89c6d6f5a1 Reviewed-by: Friedemann Kleint --- src/tools/uic/cpp/cppwriteincludes.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteincludes.cpp') diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 809c78f7004..9ead840c4d0 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -47,7 +47,7 @@ enum { warnHeaderGeneration = 0 }; static inline QString moduleHeader(const QString &module, const QString &header) { QString rc = module; - rc += QLatin1Char('/'); + rc += u'/'; rc += header; return rc; } @@ -190,8 +190,8 @@ void WriteIncludes::insertInclude(const QString &header, bool global) void WriteIncludes::writeHeaders(const OrderedSet &headers, bool global) { - const QChar openingQuote = global ? QLatin1Char('<') : QLatin1Char('"'); - const QChar closingQuote = global ? QLatin1Char('>') : QLatin1Char('"'); + const QChar openingQuote = global ? u'<' : u'"'; + const QChar closingQuote = global ? u'>' : u'"'; // Check for the old headers 'qslider.h' and replace by 'QtGui/QSlider' for (const QString &header : headers) { -- cgit v1.2.3