From b40c8e306885aae2e44ee32a5b3a7e80d7737d5f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 27 Apr 2020 16:47:57 +0200 Subject: QXmlInputSource: change EndOf{Data,Document} ushort -> char16_t Allows continuing seamless conversion to QChar, unlike ushort, which is being made explicit or deprecated, or removed. Change-Id: I95480b013b5fbc95a2b45f860a01f24e6a97e5c8 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/xml/sax/qxml.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xml/sax/qxml.h') diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index e19a398ca7..5dd9afa672 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -208,8 +208,8 @@ public: virtual QChar next(); virtual void reset(); - static const ushort EndOfData; - static const ushort EndOfDocument; + static const char16_t EndOfData; + static const char16_t EndOfDocument; protected: virtual QString fromRawData(const QByteArray &data, bool beginning = false); -- cgit v1.2.3