mirror of
https://github.com/bblanchon/ArduinoJson.git
synced 2026-07-08 01:11:00 +02:00
VariantImpl: rename getData() to data()
This commit is contained in:
@@ -65,7 +65,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
|
||||
bool add(const T& value) const {
|
||||
if (!impl_.isArray())
|
||||
return false;
|
||||
return addValue(value, impl_.getData(), impl_.getResourceManager());
|
||||
return addValue(value, impl_.data(), impl_.getResourceManager());
|
||||
}
|
||||
|
||||
// Appends a value to the array.
|
||||
@@ -75,7 +75,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
|
||||
bool add(T* value) const {
|
||||
if (!impl_.isArray())
|
||||
return false;
|
||||
return addValue(value, impl_.getData(), impl_.getResourceManager());
|
||||
return addValue(value, impl_.data(), impl_.getResourceManager());
|
||||
}
|
||||
|
||||
// Returns an iterator to the first element of the array.
|
||||
@@ -204,11 +204,11 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
|
||||
}
|
||||
|
||||
detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::VariantData* getOrCreateData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
// HACK: this function has been pulled out of VariantImpl to avoid the
|
||||
|
||||
@@ -64,7 +64,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
|
||||
}
|
||||
|
||||
operator JsonVariantConst() const {
|
||||
return JsonVariantConst(impl_.getData(), impl_.getResourceManager());
|
||||
return JsonVariantConst(impl_.data(), impl_.getResourceManager());
|
||||
}
|
||||
|
||||
// Returns true if the reference is unbound.
|
||||
@@ -99,7 +99,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
|
||||
|
||||
private:
|
||||
const detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::VariantImpl impl_;
|
||||
|
||||
@@ -226,11 +226,11 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
|
||||
}
|
||||
|
||||
detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::VariantData* getOrCreateData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
mutable detail::VariantImpl impl_;
|
||||
|
||||
@@ -29,7 +29,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
|
||||
JsonObjectConst(const detail::VariantImpl& impl) : impl_(impl) {}
|
||||
|
||||
operator JsonVariantConst() const {
|
||||
return JsonVariantConst(impl_.getData(), impl_.getResourceManager());
|
||||
return JsonVariantConst(impl_.data(), impl_.getResourceManager());
|
||||
}
|
||||
|
||||
// Returns true if the reference is unbound.
|
||||
@@ -133,7 +133,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
|
||||
|
||||
private:
|
||||
const detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::VariantImpl impl_;
|
||||
|
||||
@@ -31,11 +31,11 @@ class JsonVariant : public detail::VariantRefBase<JsonVariant>,
|
||||
}
|
||||
|
||||
detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::VariantData* getOrCreateData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
mutable detail::VariantImpl impl_;
|
||||
|
||||
@@ -50,7 +50,7 @@ class JsonVariantConst : public detail::VariantTag,
|
||||
|
||||
// Returns true if the reference is unbound.
|
||||
bool isUnbound() const {
|
||||
return impl_.getData() == nullptr;
|
||||
return impl_.data() == nullptr;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the value.
|
||||
@@ -177,7 +177,7 @@ class JsonVariantConst : public detail::VariantTag,
|
||||
|
||||
protected:
|
||||
detail::VariantData* getData() const {
|
||||
return impl_.getData();
|
||||
return impl_.data();
|
||||
}
|
||||
|
||||
detail::ResourceManager* getResourceManager() const {
|
||||
|
||||
@@ -25,7 +25,7 @@ class VariantImpl {
|
||||
VariantImpl(VariantData* data, ResourceManager* resources)
|
||||
: data_(data), resources_(resources) {}
|
||||
|
||||
VariantData* getData() const {
|
||||
VariantData* data() const {
|
||||
return data_;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user