github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 08:48:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove getElement(), getOrAddElement(), getMember(), and getOrAddMember()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-07-07 14:16:06 +02:00
parent 750cd0be92
commit c5838a876b
12 changed files with 142 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ArduinoJson/Object/ObjectImpl.hpp
View File

@@ -13,41 +13,41 @@ template <typename TObject>
template <typename TString>
inline ArrayRef ObjectShortcuts<TObject>::createNestedArray(
const TString& key) const {
return impl()->getOrAddMember(key).template to<ArrayRef>();
return impl()->operator[](key).template to<ArrayRef>();
}
template <typename TObject>
template <typename TChar>
inline ArrayRef ObjectShortcuts<TObject>::createNestedArray(TChar* key) const {
return impl()->getOrAddMember(key).template to<ArrayRef>();
return impl()->operator[](key).template to<ArrayRef>();
}
template <typename TObject>
template <typename TString>
inline ObjectRef ObjectShortcuts<TObject>::createNestedObject(
const TString& key) const {
return impl()->getOrAddMember(key).template to<ObjectRef>();
return impl()->operator[](key).template to<ObjectRef>();
}
template <typename TObject>
template <typename TChar>
inline ObjectRef ObjectShortcuts<TObject>::createNestedObject(
TChar* key) const {
return impl()->getOrAddMember(key).template to<ObjectRef>();
return impl()->operator[](key).template to<ObjectRef>();
}
template <typename TObject>
template <typename TString>
inline typename enable_if<IsString<TString>::value, bool>::type
ObjectShortcuts<TObject>::containsKey(const TString& key) const {
return !impl()->getMemberConst(key).isUnbound();
return variantGetMember(impl()->getData(), adaptString(key)) != 0;
}
template <typename TObject>
template <typename TChar>
inline typename enable_if<IsString<TChar*>::value, bool>::type
ObjectShortcuts<TObject>::containsKey(TChar* key) const {
return !impl()->getMemberConst(key).isUnbound();
return variantGetMember(impl()->getData(), adaptString(key)) != 0;
}
template <typename TObject>