diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-07-30 22:42:31 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:17:03 +0200 |
commit | ed8acbeb7c6fd137486b5c8a6eec58a3b9db862c (patch) | |
tree | d92c3f06a07082e2cc40be366faac8bc58b82def /examples/corelib | |
parent | 5282545589244c1a3e01442e3586d5666213f76d (diff) |
Automatically register data/debug stream operations in QMetaType
And remove the old manual registration code for those operators.
Add some special handling for long/ulong, as these types could be
streamed as a QVariant so far, but are not directly streamable
through QDataStream.
[ChangeLog][QtCore][QMetaType] The QMetaType::registerStreamOperators()
and QMetaType::registerDebugStreamOperator() methods have been
removed. The streaming operators for a type are now automatically
registered together with the type registration. This implies that the
operators should be visible wherever the type is visible and being used.
[ChangeLog][Behavior Incompatible Changes] Because the QDataStream and
QDebug serialization operators are automatically registered with
QMetaType, the declarations of those functions must be present at any
point where the type is used with QMetaType and QVariant.
Change-Id: I4a0732651b20319af4a8397ff90b848ca4580d99
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/corelib')
-rw-r--r-- | examples/corelib/serialization/convert/cborconverter.cpp | 2 | ||||
-rw-r--r-- | examples/corelib/serialization/convert/datastreamconverter.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp index 77df367e50..4fc8408983 100644 --- a/examples/corelib/serialization/convert/cborconverter.cpp +++ b/examples/corelib/serialization/convert/cborconverter.cpp @@ -232,8 +232,6 @@ void CborDiagnosticDumper::saveFile(QIODevice *f, const QVariant &contents, cons CborConverter::CborConverter() { qRegisterMetaType<QCborTag>(); - qRegisterMetaTypeStreamOperators<QCborTag>(); - QMetaType::registerDebugStreamOperator<QCborTag>(); } QString CborConverter::name() diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp index 6f0ca41ff5..c459696b26 100644 --- a/examples/corelib/serialization/convert/datastreamconverter.cpp +++ b/examples/corelib/serialization/convert/datastreamconverter.cpp @@ -171,7 +171,6 @@ void DataStreamDumper::saveFile(QIODevice *f, const QVariant &contents, const QS DataStreamConverter::DataStreamConverter() { qRegisterMetaType<VariantOrderedMap>(); - qRegisterMetaTypeStreamOperators<VariantOrderedMap>(); } QString DataStreamConverter::name() |