From f9655a90ed2f28c53fb1034c7c1442270a9abdb3 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 11 Jul 2025 18:30:10 +0200 Subject: [PATCH] VariantImpl: rename `getData()` to `data()` --- src/ArduinoJson/Array/ElementProxy.hpp | 2 +- src/ArduinoJson/Collection/CollectionIterator.hpp | 6 +++--- src/ArduinoJson/Deserialization/deserialize.hpp | 2 +- src/ArduinoJson/MsgPack/MsgPackBinary.hpp | 2 +- src/ArduinoJson/MsgPack/MsgPackExtension.hpp | 2 +- src/ArduinoJson/Object/MemberProxy.hpp | 2 +- src/ArduinoJson/Variant/ConverterImpl.hpp | 2 +- src/ArduinoJson/Variant/VariantImpl.hpp | 2 +- src/ArduinoJson/Variant/VariantRefBase.hpp | 2 +- src/ArduinoJson/Variant/VariantRefBaseImpl.hpp | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ArduinoJson/Array/ElementProxy.hpp b/src/ArduinoJson/Array/ElementProxy.hpp index fba45cc5..aedb594c 100644 --- a/src/ArduinoJson/Array/ElementProxy.hpp +++ b/src/ArduinoJson/Array/ElementProxy.hpp @@ -57,7 +57,7 @@ class ElementProxy : public VariantRefBase>, 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()); diff --git a/src/ArduinoJson/Collection/CollectionIterator.hpp b/src/ArduinoJson/Collection/CollectionIterator.hpp index f61d8640..bd1a4968 100644 --- a/src/ArduinoJson/Collection/CollectionIterator.hpp +++ b/src/ArduinoJson/Collection/CollectionIterator.hpp @@ -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: diff --git a/src/ArduinoJson/Deserialization/deserialize.hpp b/src/ArduinoJson/Deserialization/deserialize.hpp index 542c5cc2..05c77f97 100644 --- a/src/ArduinoJson/Deserialization/deserialize.hpp +++ b/src/ArduinoJson/Deserialization/deserialize.hpp @@ -50,7 +50,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader, auto resources = impl.getResourceManager(); dst.clear(); auto err = TDeserializer(resources, reader) - .parse(impl.getData(), options.filter, options.nestingLimit); + .parse(impl.data(), options.filter, options.nestingLimit); shrinkJsonDocument(dst); return err; } diff --git a/src/ArduinoJson/MsgPack/MsgPackBinary.hpp b/src/ArduinoJson/MsgPack/MsgPackBinary.hpp index 1deaebf6..c6ddcf69 100644 --- a/src/ArduinoJson/MsgPack/MsgPackBinary.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackBinary.hpp @@ -26,7 +26,7 @@ template <> struct Converter : 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(); diff --git a/src/ArduinoJson/MsgPack/MsgPackExtension.hpp b/src/ArduinoJson/MsgPack/MsgPackExtension.hpp index 2b41eb77..f15335ce 100644 --- a/src/ArduinoJson/MsgPack/MsgPackExtension.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackExtension.hpp @@ -32,7 +32,7 @@ template <> struct Converter : 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; diff --git a/src/ArduinoJson/Object/MemberProxy.hpp b/src/ArduinoJson/Object/MemberProxy.hpp index 2393df5d..91c19def 100644 --- a/src/ArduinoJson/Object/MemberProxy.hpp +++ b/src/ArduinoJson/Object/MemberProxy.hpp @@ -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()); diff --git a/src/ArduinoJson/Variant/ConverterImpl.hpp b/src/ArduinoJson/Variant/ConverterImpl.hpp index 2dba4084..981a0d5c 100644 --- a/src/ArduinoJson/Variant/ConverterImpl.hpp +++ b/src/ArduinoJson/Variant/ConverterImpl.hpp @@ -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 diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp index 2d965813..deef8309 100644 --- a/src/ArduinoJson/Variant/VariantImpl.hpp +++ b/src/ArduinoJson/Variant/VariantImpl.hpp @@ -27,7 +27,7 @@ class VariantImpl { VariantImpl(VariantData* data, ResourceManager* resources) : data_(data), resources_(resources) {} - VariantData* getData() const { + VariantData* data() const { return data_; } diff --git a/src/ArduinoJson/Variant/VariantRefBase.hpp b/src/ArduinoJson/Variant/VariantRefBase.hpp index 5eef658a..81ab82b1 100644 --- a/src/ArduinoJson/Variant/VariantRefBase.hpp +++ b/src/ArduinoJson/Variant/VariantRefBase.hpp @@ -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; diff --git a/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp b/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp index 51396493..b57de7f4 100644 --- a/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp +++ b/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp @@ -148,7 +148,7 @@ inline JsonArray VariantRefBase::to() const { if (impl.isUnbound()) return JsonArray(); impl.clear(); - impl.getData()->toArray(); + impl.data()->toArray(); return JsonArray(impl); } @@ -159,7 +159,7 @@ JsonObject VariantRefBase::to() const { if (impl.isUnbound()) return JsonObject(); impl.clear(); - impl.getData()->toObject(); + impl.data()->toObject(); return JsonObject(impl); }