QMetaType: Support char16_t and char32_t

Change-Id: Ieec6d4bc64967d875ea12b31638aab05bc682ea3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 54 insertions, 0 deletions

diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index df286085bc..3026e554bf 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -1025,6 +1025,31 @@ QDataStream &QDataStream::operator>>(char *&s)
     return readBytes(s, len);
 }
 
+/*!
+ \overload
+
+ Reads a char from the stream into char \a chr.
+*/
+QDataStream &QDataStream::operator>>(char16_t &c)
+{
+    quint16 u;
+    *this >> u;
+    c = char16_t(u);
+    return *this;
+}
+
+/*!
+ \overload
+
+ Reads a char from the stream into char \a chr.
+*/
+QDataStream &QDataStream::operator>>(char32_t &c)
+{
+    quint32 u;
+    *this >> u;
+    c = char32_t(u);
+    return *this;
+}
 
 /*!
     Reads the buffer \a s from the stream and returns a reference to
@@ -1338,6 +1363,30 @@ QDataStream &QDataStream::operator<<(const char *s)
 }
 
 /*!
+  \overload
+  \since 6.0
+
+  Writes a character, \a c, to the stream. Returns a reference to
+  the stream
+*/
+QDataStream &QDataStream::operator<<(char16_t c)
+{
+    return *this << qint16(c);
+}
+
+/*!
+  \overload
+  \since 6.0
+
+  Writes a character, \a c, to the stream. Returns a reference to
+  the stream
+*/
+QDataStream &QDataStream::operator<<(char32_t c)
+{
+    return *this << qint32(c);
+}
+
+/*!
     Writes the length specifier \a len and the buffer \a s to the
     stream and returns a reference to the stream.
 
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index c7b0008039..4568ba3a84 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -163,6 +163,8 @@ public:
     QDataStream &operator>>(float &f);
     QDataStream &operator>>(double &f);
     QDataStream &operator>>(char *&str);
+    QDataStream &operator>>(char16_t &c);
+    QDataStream &operator>>(char32_t &c);
 
     QDataStream &operator<<(qint8 i);
     QDataStream &operator<<(quint8 i);
@@ -178,6 +180,9 @@ public:
     QDataStream &operator<<(float f);
     QDataStream &operator<<(double f);
     QDataStream &operator<<(const char *str);
+    QDataStream &operator<<(char16_t c);
+    QDataStream &operator<<(char32_t c);
+
 
     QDataStream &readBytes(char *&, uint &len);
     int readRawData(char *, int len);