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

Rename ObjectConstRef to JsonObjectConst

Browse Source
This commit is contained in:
Benoit Blanchon
2022-12-19 11:37:08 +01:00
parent dff07ebfe8
commit dc42d93b0f
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/Misc/TypeTraits.cpp
View File

@ -190,7 +190,7 @@ TEST_CASE("Polyfills/type_traits") {
CHECK((is_convertible<JsonObject, JsonVariantConst>::value == true)); CHECK((is_convertible<JsonObject, JsonVariantConst>::value == true));
CHECK((is_convertible<MemberProxy<JsonObject, const char*>, CHECK((is_convertible<MemberProxy<JsonObject, const char*>,
JsonVariantConst>::value == true)); JsonVariantConst>::value == true));
CHECK((is_convertible<ObjectConstRef, JsonVariantConst>::value == true)); CHECK((is_convertible<JsonObjectConst, JsonVariantConst>::value == true));
CHECK( CHECK(
(is_convertible<DynamicJsonDocument, JsonVariantConst>::value == true)); (is_convertible<DynamicJsonDocument, JsonVariantConst>::value == true));
CHECK((is_convertible<StaticJsonDocument<10>, JsonVariantConst>::value == CHECK((is_convertible<StaticJsonDocument<10>, JsonVariantConst>::value ==

2
src/ArduinoJson.hpp
View File

@ -51,8 +51,8 @@ using ARDUINOJSON_NAMESPACE::JsonArray;
using ARDUINOJSON_NAMESPACE::JsonArrayConst; using ARDUINOJSON_NAMESPACE::JsonArrayConst;
typedef ARDUINOJSON_NAMESPACE::Float JsonFloat; typedef ARDUINOJSON_NAMESPACE::Float JsonFloat;
typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger; typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger;
typedef ARDUINOJSON_NAMESPACE::ObjectConstRef JsonObjectConst;
using ARDUINOJSON_NAMESPACE::JsonObject; using ARDUINOJSON_NAMESPACE::JsonObject;
using ARDUINOJSON_NAMESPACE::JsonObjectConst;
typedef ARDUINOJSON_NAMESPACE::Pair JsonPair; typedef ARDUINOJSON_NAMESPACE::Pair JsonPair;
typedef ARDUINOJSON_NAMESPACE::PairConst JsonPairConst; typedef ARDUINOJSON_NAMESPACE::PairConst JsonPairConst;
typedef ARDUINOJSON_NAMESPACE::String JsonString; typedef ARDUINOJSON_NAMESPACE::String JsonString;

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

@ -21,7 +21,7 @@ class Filter {
} }
bool allowObject() const { bool allowObject() const {
return _variant == true || _variant.is<ObjectConstRef>(); return _variant == true || _variant.is<JsonObjectConst>();
} }
bool allowValue() const { bool allowValue() const {

2
src/ArduinoJson/Document/BasicJsonDocument.hpp
View File

@ -68,7 +68,7 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
is_same<T, VariantRef>::value || is_same<T, VariantConstRef>::value || is_same<T, VariantRef>::value || is_same<T, VariantConstRef>::value ||
is_same<T, JsonArray>::value || is_same<T, JsonArrayConst>::value || is_same<T, JsonArray>::value || is_same<T, JsonArrayConst>::value ||
is_same<T, JsonObject>::value || is_same<T, JsonObject>::value ||
is_same<T, ObjectConstRef>::value>::type* = 0) is_same<T, JsonObjectConst>::value>::type* = 0)
: JsonDocument(allocPool(src.memoryUsage())) { : JsonDocument(allocPool(src.memoryUsage())) {
set(src); set(src);
} }

11
src/ArduinoJson/Object/JsonObject.hpp
View File

@ -4,8 +4,9 @@
#pragma once #pragma once
#include <ArduinoJson/Object/JsonObjectConst.hpp>
#include <ArduinoJson/Object/MemberProxy.hpp> #include <ArduinoJson/Object/MemberProxy.hpp>
#include <ArduinoJson/Object/ObjectConstRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
@ -26,8 +27,8 @@ class JsonObject : public VariantOperators<JsonObject> {
return VariantRef(_pool, reinterpret_cast<VariantData*>(data)); return VariantRef(_pool, reinterpret_cast<VariantData*>(data));
} }
operator ObjectConstRef() const { operator JsonObjectConst() const {
return ObjectConstRef(_data); return JsonObjectConst(_data);
} }
operator VariantConstRef() const { operator VariantConstRef() const {
@ -70,14 +71,14 @@ class JsonObject : public VariantOperators<JsonObject> {
_data->clear(); _data->clear();
} }
FORCE_INLINE bool set(ObjectConstRef src) { FORCE_INLINE bool set(JsonObjectConst src) {
if (!_data || !src._data) if (!_data || !src._data)
return false; return false;
return _data->copyFrom(*src._data, _pool); return _data->copyFrom(*src._data, _pool);
} }
FORCE_INLINE bool operator==(JsonObject rhs) const { FORCE_INLINE bool operator==(JsonObject rhs) const {
return ObjectConstRef(_data) == ObjectConstRef(rhs._data); return JsonObjectConst(_data) == JsonObjectConst(rhs._data);
} }
template <typename TString> template <typename TString>

12
src/ArduinoJson/Object/ObjectConstRef.hpp → src/ArduinoJson/Object/JsonObjectConst.hpp
View File

@ -9,15 +9,15 @@
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
class ObjectConstRef : public VariantOperators<ObjectConstRef> { class JsonObjectConst : public VariantOperators<JsonObjectConst> {
friend class JsonObject; friend class JsonObject;
friend class VariantAttorney; friend class VariantAttorney;
public: public:
typedef ObjectConstIterator iterator; typedef ObjectConstIterator iterator;
ObjectConstRef() : _data(0) {} JsonObjectConst() : _data(0) {}
ObjectConstRef(const CollectionData* data) : _data(data) {} JsonObjectConst(const CollectionData* data) : _data(data) {}
operator VariantConstRef() const { operator VariantConstRef() const {
return VariantConstRef(collectionToVariant(_data)); return VariantConstRef(collectionToVariant(_data));
@ -87,7 +87,7 @@ class ObjectConstRef : public VariantOperators<ObjectConstRef> {
return VariantConstRef(getMember(adaptString(key))); return VariantConstRef(getMember(adaptString(key)));
} }
FORCE_INLINE bool operator==(ObjectConstRef rhs) const { FORCE_INLINE bool operator==(JsonObjectConst rhs) const {
if (_data == rhs._data) if (_data == rhs._data)
return true; return true;
@ -119,12 +119,12 @@ class ObjectConstRef : public VariantOperators<ObjectConstRef> {
}; };
template <> template <>
struct Converter<ObjectConstRef> : private VariantAttorney { struct Converter<JsonObjectConst> : private VariantAttorney {
static void toJson(VariantConstRef src, VariantRef dst) { static void toJson(VariantConstRef src, VariantRef dst) {
variantCopyFrom(getData(dst), getData(src), getPool(dst)); variantCopyFrom(getData(dst), getData(src), getPool(dst));
} }
static ObjectConstRef fromJson(VariantConstRef src) { static JsonObjectConst fromJson(VariantConstRef src) {
const VariantData* data = getData(src); const VariantData* data = getData(src);
return data != 0 ? data->asObject() : 0; return data != 0 ? data->asObject() : 0;
} }

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

@ -101,7 +101,7 @@ struct ObjectComparer : ComparerBase {
explicit ObjectComparer(const CollectionData& rhs) : _rhs(&rhs) {} explicit ObjectComparer(const CollectionData& rhs) : _rhs(&rhs) {}
CompareResult visitObject(const CollectionData& lhs) { CompareResult visitObject(const CollectionData& lhs) {
if (ObjectConstRef(&lhs) == ObjectConstRef(_rhs)) if (JsonObjectConst(&lhs) == JsonObjectConst(_rhs))
return COMPARE_RESULT_EQUAL; return COMPARE_RESULT_EQUAL;
else else
return COMPARE_RESULT_DIFFER; return COMPARE_RESULT_DIFFER;