feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Rename ObjectIterator to JsonObjectIterator

Browse Source
This commit is contained in:
Benoit Blanchon
2022-12-19 11:41:14 +01:00
parent 3a9803679f
commit 2f2e0e9415
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@
#include <ArduinoJson/Object/JsonObjectConst.hpp> #include <ArduinoJson/Object/JsonObjectConst.hpp>
#include <ArduinoJson/Object/MemberProxy.hpp> #include <ArduinoJson/Object/MemberProxy.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
class JsonArray; class JsonArray;
@ -16,7 +15,7 @@ class JsonObject : public VariantOperators<JsonObject> {
friend class VariantAttorney; friend class VariantAttorney;
public: public:
typedef ObjectIterator iterator; typedef JsonObjectIterator iterator;
FORCE_INLINE JsonObject() : _data(0), _pool(0) {} FORCE_INLINE JsonObject() : _data(0), _pool(0) {}
FORCE_INLINE JsonObject(MemoryPool* buf, CollectionData* data) FORCE_INLINE JsonObject(MemoryPool* buf, CollectionData* data)

4
src/ArduinoJson/Object/JsonObjectConst.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <ArduinoJson/Object/ObjectIterator.hpp> #include <ArduinoJson/Object/JsonObjectIterator.hpp>
#include <ArduinoJson/Variant/VariantOperators.hpp> #include <ArduinoJson/Variant/VariantOperators.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
@ -14,7 +14,7 @@ class JsonObjectConst : public VariantOperators<JsonObjectConst> {
friend class VariantAttorney; friend class VariantAttorney;
public: public:
typedef ObjectConstIterator iterator; typedef JsonObjectConstIterator iterator;
JsonObjectConst() : _data(0) {} JsonObjectConst() : _data(0) {}
JsonObjectConst(const CollectionData* data) : _data(data) {} JsonObjectConst(const CollectionData* data) : _data(data) {}

28
src/ArduinoJson/Object/ObjectIterator.hpp → src/ArduinoJson/Object/JsonObjectIterator.hpp
View File

@ -25,13 +25,13 @@ class JsonPairPtr {
JsonPair _pair; JsonPair _pair;
}; };
class ObjectIterator { class JsonObjectIterator {
friend class JsonObject; friend class JsonObject;
public: public:
ObjectIterator() : _slot(0) {} JsonObjectIterator() : _slot(0) {}
explicit ObjectIterator(MemoryPool* pool, VariantSlot* slot) explicit JsonObjectIterator(MemoryPool* pool, VariantSlot* slot)
: _pool(pool), _slot(slot) {} : _pool(pool), _slot(slot) {}
JsonPair operator*() const { JsonPair operator*() const {
@ -41,20 +41,20 @@ class ObjectIterator {
return JsonPairPtr(_pool, _slot); return JsonPairPtr(_pool, _slot);
} }
bool operator==(const ObjectIterator& other) const { bool operator==(const JsonObjectIterator& other) const {
return _slot == other._slot; return _slot == other._slot;
} }
bool operator!=(const ObjectIterator& other) const { bool operator!=(const JsonObjectIterator& other) const {
return _slot != other._slot; return _slot != other._slot;
} }
ObjectIterator& operator++() { JsonObjectIterator& operator++() {
_slot = _slot->next(); _slot = _slot->next();
return *this; return *this;
} }
ObjectIterator& operator+=(size_t distance) { JsonObjectIterator& operator+=(size_t distance) {
_slot = _slot->next(distance); _slot = _slot->next(distance);
return *this; return *this;
} }
@ -80,13 +80,13 @@ class JsonPairConstPtr {
JsonPairConst _pair; JsonPairConst _pair;
}; };
class ObjectConstIterator { class JsonObjectConstIterator {
friend class JsonObject; friend class JsonObject;
public: public:
ObjectConstIterator() : _slot(0) {} JsonObjectConstIterator() : _slot(0) {}
explicit ObjectConstIterator(const VariantSlot* slot) : _slot(slot) {} explicit JsonObjectConstIterator(const VariantSlot* slot) : _slot(slot) {}
JsonPairConst operator*() const { JsonPairConst operator*() const {
return JsonPairConst(_slot); return JsonPairConst(_slot);
@ -95,20 +95,20 @@ class ObjectConstIterator {
return JsonPairConstPtr(_slot); return JsonPairConstPtr(_slot);
} }
bool operator==(const ObjectConstIterator& other) const { bool operator==(const JsonObjectConstIterator& other) const {
return _slot == other._slot; return _slot == other._slot;
} }
bool operator!=(const ObjectConstIterator& other) const { bool operator!=(const JsonObjectConstIterator& other) const {
return _slot != other._slot; return _slot != other._slot;
} }
ObjectConstIterator& operator++() { JsonObjectConstIterator& operator++() {
_slot = _slot->next(); _slot = _slot->next();
return *this; return *this;
} }
ObjectConstIterator& operator+=(size_t distance) { JsonObjectConstIterator& operator+=(size_t distance) {
_slot = _slot->next(distance); _slot = _slot->next(distance);
return *this; return *this;
} }