bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-30 02:37:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

VariantImpl: rename getData() to data()

Browse Source
This commit is contained in:
Benoit Blanchon
2025-07-11 18:30:10 +02:00
parent 25942cce2d
commit f9655a90ed
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Array/ElementProxy.hpp
View File

@ -57,7 +57,7 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
VariantImpl getOrCreateImpl() const { VariantImpl getOrCreateImpl() const {
auto impl = VariantAttorney::getOrCreateImpl(upstream_); auto impl = VariantAttorney::getOrCreateImpl(upstream_);
auto data = impl.getData(); auto data = impl.data();
if (data) if (data)
data->getOrCreateArray(); data->getOrCreateArray();
return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager()); return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager());

6
src/ArduinoJson/Collection/CollectionIterator.hpp
View File

@ -24,7 +24,7 @@ class CollectionIterator {
void next() { void next() {
ARDUINOJSON_ASSERT(!done()); ARDUINOJSON_ASSERT(!done());
auto nextId = value_.getData()->next; auto nextId = value_.data()->next;
auto resources = value_.getResourceManager(); auto resources = value_.getResourceManager();
value_ = VariantImpl(resources->getVariant(nextId), resources); value_ = VariantImpl(resources->getVariant(nextId), resources);
currentId_ = nextId; currentId_ = nextId;
@ -51,11 +51,11 @@ class CollectionIterator {
} }
VariantData* data() { VariantData* data() {
return value_.getData(); return value_.data();
} }
const VariantData* data() const { const VariantData* data() const {
return value_.getData(); return value_.data();
} }
private: private:

2
src/ArduinoJson/Deserialization/deserialize.hpp
View File

@ -50,7 +50,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader,
auto resources = impl.getResourceManager(); auto resources = impl.getResourceManager();
dst.clear(); dst.clear();
auto err = TDeserializer<TReader>(resources, reader) auto err = TDeserializer<TReader>(resources, reader)
.parse(impl.getData(), options.filter, options.nestingLimit); .parse(impl.data(), options.filter, options.nestingLimit);
shrinkJsonDocument(dst); shrinkJsonDocument(dst);
return err; return err;
} }

2
src/ArduinoJson/MsgPack/MsgPackBinary.hpp
View File

@ -26,7 +26,7 @@ template <>
struct Converter<MsgPackBinary> : private detail::VariantAttorney { struct Converter<MsgPackBinary> : private detail::VariantAttorney {
static void toJson(MsgPackBinary src, JsonVariant dst) { static void toJson(MsgPackBinary src, JsonVariant dst) {
auto impl = getImpl(dst); auto impl = getImpl(dst);
auto data = impl.getData(); auto data = impl.data();
if (!data) if (!data)
return; return;
auto resources = impl.getResourceManager(); auto resources = impl.getResourceManager();

2
src/ArduinoJson/MsgPack/MsgPackExtension.hpp
View File

@ -32,7 +32,7 @@ template <>
struct Converter<MsgPackExtension> : private detail::VariantAttorney { struct Converter<MsgPackExtension> : private detail::VariantAttorney {
static void toJson(MsgPackExtension src, JsonVariant dst) { static void toJson(MsgPackExtension src, JsonVariant dst) {
auto impl = getImpl(dst); auto impl = getImpl(dst);
auto data = impl.getData(); auto data = impl.data();
auto resources = impl.getResourceManager(); auto resources = impl.getResourceManager();
if (!data) if (!data)
return; return;

2
src/ArduinoJson/Object/MemberProxy.hpp
View File

@ -58,7 +58,7 @@ class MemberProxy
VariantImpl getOrCreateImpl() const { VariantImpl getOrCreateImpl() const {
auto impl = VariantAttorney::getOrCreateImpl(upstream_); auto impl = VariantAttorney::getOrCreateImpl(upstream_);
auto data = impl.getData(); auto data = impl.data();
if (data) if (data)
data->getOrCreateObject(); data->getOrCreateObject();
return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager()); return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager());

2
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@ -239,7 +239,7 @@ inline void convertToJson(const ::Printable& src, JsonVariant dst) {
src.printTo(print); src.printTo(print);
if (print.overflowed()) if (print.overflowed())
return; return;
print.save(impl.getData()); print.save(impl.data());
} }
#endif #endif

2
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@ -27,7 +27,7 @@ class VariantImpl {
VariantImpl(VariantData* data, ResourceManager* resources) VariantImpl(VariantData* data, ResourceManager* resources)
: data_(data), resources_(resources) {} : data_(data), resources_(resources) {}
VariantData* getData() const { VariantData* data() const {
return data_; return data_;
} }

2
src/ArduinoJson/Variant/VariantRefBase.hpp
View File

@ -269,7 +269,7 @@ class VariantRefBase : public VariantTag {
VariantImpl getOrCreateArray() const { VariantImpl getOrCreateArray() const {
auto impl = getOrCreateImpl(); auto impl = getOrCreateImpl();
auto data = impl.getData(); auto data = impl.data();
if (data) if (data)
data->getOrCreateArray(); data->getOrCreateArray();
return impl; return impl;

4
src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
View File

@ -148,7 +148,7 @@ inline JsonArray VariantRefBase<TDerived>::to() const {
if (impl.isUnbound()) if (impl.isUnbound())
return JsonArray(); return JsonArray();
impl.clear(); impl.clear();
impl.getData()->toArray(); impl.data()->toArray();
return JsonArray(impl); return JsonArray(impl);
} }
@ -159,7 +159,7 @@ JsonObject VariantRefBase<TDerived>::to() const {
if (impl.isUnbound()) if (impl.isUnbound())
return JsonObject(); return JsonObject();
impl.clear(); impl.clear();
impl.getData()->toObject(); impl.data()->toObject();
return JsonObject(impl); return JsonObject(impl);
} }