mirror of
https://github.com/bblanchon/ArduinoJson.git
synced 2025-07-29 10:17:39 +02:00
VariantImpl: rename getData()
to data()
This commit is contained in:
@ -57,7 +57,7 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
|
||||
|
||||
VariantImpl getOrCreateImpl() const {
|
||||
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
|
||||
auto data = impl.getData();
|
||||
auto data = impl.data();
|
||||
if (data)
|
||||
data->getOrCreateArray();
|
||||
return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager());
|
||||
|
@ -24,7 +24,7 @@ class CollectionIterator {
|
||||
|
||||
void next() {
|
||||
ARDUINOJSON_ASSERT(!done());
|
||||
auto nextId = value_.getData()->next;
|
||||
auto nextId = value_.data()->next;
|
||||
auto resources = value_.getResourceManager();
|
||||
value_ = VariantImpl(resources->getVariant(nextId), resources);
|
||||
currentId_ = nextId;
|
||||
@ -51,11 +51,11 @@ class CollectionIterator {
|
||||
}
|
||||
|
||||
VariantData* data() {
|
||||
return value_.getData();
|
||||
return value_.data();
|
||||
}
|
||||
|
||||
const VariantData* data() const {
|
||||
return value_.getData();
|
||||
return value_.data();
|
||||
}
|
||||
|
||||
private:
|
||||
|
@ -50,7 +50,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader,
|
||||
auto resources = impl.getResourceManager();
|
||||
dst.clear();
|
||||
auto err = TDeserializer<TReader>(resources, reader)
|
||||
.parse(impl.getData(), options.filter, options.nestingLimit);
|
||||
.parse(impl.data(), options.filter, options.nestingLimit);
|
||||
shrinkJsonDocument(dst);
|
||||
return err;
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ template <>
|
||||
struct Converter<MsgPackBinary> : private detail::VariantAttorney {
|
||||
static void toJson(MsgPackBinary src, JsonVariant dst) {
|
||||
auto impl = getImpl(dst);
|
||||
auto data = impl.getData();
|
||||
auto data = impl.data();
|
||||
if (!data)
|
||||
return;
|
||||
auto resources = impl.getResourceManager();
|
||||
|
@ -32,7 +32,7 @@ template <>
|
||||
struct Converter<MsgPackExtension> : private detail::VariantAttorney {
|
||||
static void toJson(MsgPackExtension src, JsonVariant dst) {
|
||||
auto impl = getImpl(dst);
|
||||
auto data = impl.getData();
|
||||
auto data = impl.data();
|
||||
auto resources = impl.getResourceManager();
|
||||
if (!data)
|
||||
return;
|
||||
|
@ -58,7 +58,7 @@ class MemberProxy
|
||||
|
||||
VariantImpl getOrCreateImpl() const {
|
||||
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
|
||||
auto data = impl.getData();
|
||||
auto data = impl.data();
|
||||
if (data)
|
||||
data->getOrCreateObject();
|
||||
return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager());
|
||||
|
@ -239,7 +239,7 @@ inline void convertToJson(const ::Printable& src, JsonVariant dst) {
|
||||
src.printTo(print);
|
||||
if (print.overflowed())
|
||||
return;
|
||||
print.save(impl.getData());
|
||||
print.save(impl.data());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -27,7 +27,7 @@ class VariantImpl {
|
||||
VariantImpl(VariantData* data, ResourceManager* resources)
|
||||
: data_(data), resources_(resources) {}
|
||||
|
||||
VariantData* getData() const {
|
||||
VariantData* data() const {
|
||||
return data_;
|
||||
}
|
||||
|
||||
|
@ -269,7 +269,7 @@ class VariantRefBase : public VariantTag {
|
||||
|
||||
VariantImpl getOrCreateArray() const {
|
||||
auto impl = getOrCreateImpl();
|
||||
auto data = impl.getData();
|
||||
auto data = impl.data();
|
||||
if (data)
|
||||
data->getOrCreateArray();
|
||||
return impl;
|
||||
|
@ -148,7 +148,7 @@ inline JsonArray VariantRefBase<TDerived>::to() const {
|
||||
if (impl.isUnbound())
|
||||
return JsonArray();
|
||||
impl.clear();
|
||||
impl.getData()->toArray();
|
||||
impl.data()->toArray();
|
||||
return JsonArray(impl);
|
||||
}
|
||||
|
||||
@ -159,7 +159,7 @@ JsonObject VariantRefBase<TDerived>::to() const {
|
||||
if (impl.isUnbound())
|
||||
return JsonObject();
|
||||
impl.clear();
|
||||
impl.getData()->toObject();
|
||||
impl.data()->toObject();
|
||||
return JsonObject(impl);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user