Skip to content

Commit f9655a9

Browse files
committed
VariantImpl: rename getData() to data()
1 parent 25942cc commit f9655a9

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

src/ArduinoJson/Array/ElementProxy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
5757

5858
VariantImpl getOrCreateImpl() const {
5959
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
60-
auto data = impl.getData();
60+
auto data = impl.data();
6161
if (data)
6262
data->getOrCreateArray();
6363
return VariantImpl(impl.getOrAddElement(index_), impl.getResourceManager());

src/ArduinoJson/Collection/CollectionIterator.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CollectionIterator {
2424

2525
void next() {
2626
ARDUINOJSON_ASSERT(!done());
27-
auto nextId = value_.getData()->next;
27+
auto nextId = value_.data()->next;
2828
auto resources = value_.getResourceManager();
2929
value_ = VariantImpl(resources->getVariant(nextId), resources);
3030
currentId_ = nextId;
@@ -51,11 +51,11 @@ class CollectionIterator {
5151
}
5252

5353
VariantData* data() {
54-
return value_.getData();
54+
return value_.data();
5555
}
5656

5757
const VariantData* data() const {
58-
return value_.getData();
58+
return value_.data();
5959
}
6060

6161
private:

src/ArduinoJson/Deserialization/deserialize.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ DeserializationError doDeserialize(TDestination&& dst, TReader reader,
5050
auto resources = impl.getResourceManager();
5151
dst.clear();
5252
auto err = TDeserializer<TReader>(resources, reader)
53-
.parse(impl.getData(), options.filter, options.nestingLimit);
53+
.parse(impl.data(), options.filter, options.nestingLimit);
5454
shrinkJsonDocument(dst);
5555
return err;
5656
}

src/ArduinoJson/MsgPack/MsgPackBinary.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ template <>
2626
struct Converter<MsgPackBinary> : private detail::VariantAttorney {
2727
static void toJson(MsgPackBinary src, JsonVariant dst) {
2828
auto impl = getImpl(dst);
29-
auto data = impl.getData();
29+
auto data = impl.data();
3030
if (!data)
3131
return;
3232
auto resources = impl.getResourceManager();

src/ArduinoJson/MsgPack/MsgPackExtension.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ template <>
3232
struct Converter<MsgPackExtension> : private detail::VariantAttorney {
3333
static void toJson(MsgPackExtension src, JsonVariant dst) {
3434
auto impl = getImpl(dst);
35-
auto data = impl.getData();
35+
auto data = impl.data();
3636
auto resources = impl.getResourceManager();
3737
if (!data)
3838
return;

src/ArduinoJson/Object/MemberProxy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class MemberProxy
5858

5959
VariantImpl getOrCreateImpl() const {
6060
auto impl = VariantAttorney::getOrCreateImpl(upstream_);
61-
auto data = impl.getData();
61+
auto data = impl.data();
6262
if (data)
6363
data->getOrCreateObject();
6464
return VariantImpl(impl.getOrAddMember(key_), impl.getResourceManager());

src/ArduinoJson/Variant/ConverterImpl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ inline void convertToJson(const ::Printable& src, JsonVariant dst) {
239239
src.printTo(print);
240240
if (print.overflowed())
241241
return;
242-
print.save(impl.getData());
242+
print.save(impl.data());
243243
}
244244

245245
#endif

src/ArduinoJson/Variant/VariantImpl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class VariantImpl {
2727
VariantImpl(VariantData* data, ResourceManager* resources)
2828
: data_(data), resources_(resources) {}
2929

30-
VariantData* getData() const {
30+
VariantData* data() const {
3131
return data_;
3232
}
3333

src/ArduinoJson/Variant/VariantRefBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class VariantRefBase : public VariantTag {
269269

270270
VariantImpl getOrCreateArray() const {
271271
auto impl = getOrCreateImpl();
272-
auto data = impl.getData();
272+
auto data = impl.data();
273273
if (data)
274274
data->getOrCreateArray();
275275
return impl;

src/ArduinoJson/Variant/VariantRefBaseImpl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ inline JsonArray VariantRefBase<TDerived>::to() const {
148148
if (impl.isUnbound())
149149
return JsonArray();
150150
impl.clear();
151-
impl.getData()->toArray();
151+
impl.data()->toArray();
152152
return JsonArray(impl);
153153
}
154154

@@ -159,7 +159,7 @@ JsonObject VariantRefBase<TDerived>::to() const {
159159
if (impl.isUnbound())
160160
return JsonObject();
161161
impl.clear();
162-
impl.getData()->toObject();
162+
impl.data()->toObject();
163163
return JsonObject(impl);
164164
}
165165

0 commit comments

Comments
 (0)