diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-18 16:34:55 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-20 17:25:09 +0200 |
commit | 35d90cb89809b540fec49e974e1a9f802f819eb6 (patch) | |
tree | dd0d8affdc3cc4419f69699e51f3e46a86685d65 /src/corelib/serialization/qjson_p.h | |
parent | a41c61fb2d2f973fd1cd5e95ee5be1ac1a4f8433 (diff) |
Resolve the remaining open ### Qt6 comments of QJsonValue
Changed QJsonValue to use QCborValue for data storage. Removed unused
internal methods.
Task-number: QTBUG-85700
Change-Id: I784fc7c0c4407f79eb7ca87a1f5116f00c26155d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qjson_p.h')
-rw-r--r-- | src/corelib/serialization/qjson_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h index 90f1071b71..edab2c6b13 100644 --- a/src/corelib/serialization/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h @@ -204,13 +204,12 @@ class Value { public: static QCborContainerPrivate *container(const QCborValue &v) { return v.container; } + static qint64 valueHelper(const QCborValue &v) { return v.n; } static QJsonValue fromTrustedCbor(const QCborValue &v) { QJsonValue result; - result.d = v.container; - result.n = v.n; - result.t = v.t; + result.value = v; return result; } }; |