diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-08-21 10:35:30 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-10-03 14:48:47 +0000 |
| commit | cc24fc04067f23c445c7ca54733b0870e39b7d7d (patch) | |
| tree | a894013d6249d83ed5114b32da97e881409429f9 /src | |
| parent | 98ec8bed198d3428a9642c542518f7cca07acfb3 (diff) | |
Implement QJsonDocument data stream operators
Task-number: QTBUG-48313
Change-Id: I25ebeed94c9340819e925a7740bbee21de73a0ca
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsondocument.cpp | 16 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsondocument.h | 5 |
3 files changed, 27 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index dbc11c57ec..29e57c659d 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1416,7 +1416,6 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QJsonValue: case QMetaType::QJsonObject: case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: case QMetaType::QCborValue: case QMetaType::QCborArray: case QMetaType::QCborMap: @@ -1561,6 +1560,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QCborSimpleType: stream << *static_cast<const quint8 *>(data); break; + case QMetaType::QJsonDocument: + stream << *static_cast<const NS(QJsonDocument)*>(data); + break; #endif // QT_BOOTSTRAPPED case QMetaType::QFont: case QMetaType::QPixmap: @@ -1648,7 +1650,6 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QJsonValue: case QMetaType::QJsonObject: case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: case QMetaType::QCborValue: case QMetaType::QCborArray: case QMetaType::QCborMap: @@ -1799,6 +1800,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QCborSimpleType: stream >> *static_cast<quint8 *>(data); break; + case QMetaType::QJsonDocument: + stream >> *static_cast<NS(QJsonDocument)*>(data); + break; #endif // QT_BOOTSTRAPPED case QMetaType::QFont: case QMetaType::QPixmap: diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 5018f7c267..5647b771fb 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -669,4 +669,20 @@ QDebug operator<<(QDebug dbg, const QJsonDocument &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonDocument &doc) +{ + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonDocument &doc) +{ + QByteArray buffer; + stream >> buffer; + doc = QJsonDocument::fromJson(buffer); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index b784890c54..a749439b7d 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -172,6 +172,11 @@ Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonDocument) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonDocument &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonDocument &); +#endif + QT_END_NAMESPACE #endif // QJSONDOCUMENT_H |