diff --git a/src/ArduinoJson/Array/ArrayImpl.hpp b/src/ArduinoJson/Array/ArrayImpl.hpp index 4b390eb6..831b1bae 100644 --- a/src/ArduinoJson/Array/ArrayImpl.hpp +++ b/src/ArduinoJson/Array/ArrayImpl.hpp @@ -15,7 +15,7 @@ inline VariantImpl::iterator VariantImpl::at(size_t index) const { auto it = createIterator(); while (!it.done() && index) { - it.next(resources_); + it.move(resources_); --index; } return it; @@ -37,7 +37,7 @@ inline VariantData* VariantImpl::addNewElement(VariantData* data, inline VariantData* VariantImpl::getOrAddElement(size_t index) { auto it = createIterator(); while (!it.done() && index > 0) { - it.next(resources_); + it.move(resources_); index--; } if (it.done()) diff --git a/src/ArduinoJson/Array/JsonArrayIterator.hpp b/src/ArduinoJson/Array/JsonArrayIterator.hpp index 3121fe12..b3d4abf4 100644 --- a/src/ArduinoJson/Array/JsonArrayIterator.hpp +++ b/src/ArduinoJson/Array/JsonArrayIterator.hpp @@ -50,7 +50,7 @@ class JsonArrayIterator { } JsonArrayIterator& operator++() { - iterator_.next(resources_); + iterator_.move(resources_); return *this; } @@ -84,7 +84,7 @@ class JsonArrayConstIterator { } JsonArrayConstIterator& operator++() { - iterator_.next(resources_); + iterator_.move(resources_); return *this; } diff --git a/src/ArduinoJson/Collection/CollectionImpl.hpp b/src/ArduinoJson/Collection/CollectionImpl.hpp index f675afcf..f9707065 100644 --- a/src/ArduinoJson/Collection/CollectionImpl.hpp +++ b/src/ArduinoJson/Collection/CollectionImpl.hpp @@ -8,7 +8,7 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE -inline void CollectionIterator::next(const ResourceManager* resources) { +inline void CollectionIterator::move(const ResourceManager* resources) { ARDUINOJSON_ASSERT(slot_); auto nextId = slot_->next; slot_ = resources->getVariant(nextId); @@ -136,7 +136,7 @@ inline size_t VariantImpl::nesting() const { if (!data_ || !data_->isCollection()) return 0; size_t maxChildNesting = 0; - for (auto it = createIterator(); !it.done(); it.next(resources_)) { + for (auto it = createIterator(); !it.done(); it.move(resources_)) { size_t childNesting = VariantImpl(it.data(), resources_).nesting(); if (childNesting > maxChildNesting) maxChildNesting = childNesting; diff --git a/src/ArduinoJson/Collection/CollectionIterator.hpp b/src/ArduinoJson/Collection/CollectionIterator.hpp index d8c1403b..6794d8b7 100644 --- a/src/ArduinoJson/Collection/CollectionIterator.hpp +++ b/src/ArduinoJson/Collection/CollectionIterator.hpp @@ -20,7 +20,7 @@ class CollectionIterator { public: CollectionIterator() : slot_(nullptr), currentId_(NULL_SLOT) {} - void next(const ResourceManager* resources); + void move(const ResourceManager* resources); bool done() const { return slot_ == nullptr; diff --git a/src/ArduinoJson/Object/JsonObjectIterator.hpp b/src/ArduinoJson/Object/JsonObjectIterator.hpp index 3adb25a5..f78239ad 100644 --- a/src/ArduinoJson/Object/JsonObjectIterator.hpp +++ b/src/ArduinoJson/Object/JsonObjectIterator.hpp @@ -34,8 +34,8 @@ class JsonObjectIterator { } JsonObjectIterator& operator++() { - iterator_.next(resources_); // key - iterator_.next(resources_); // value + iterator_.move(resources_); // key + iterator_.move(resources_); // value return *this; } @@ -70,8 +70,8 @@ class JsonObjectConstIterator { } JsonObjectConstIterator& operator++() { - iterator_.next(resources_); // key - iterator_.next(resources_); // value + iterator_.move(resources_); // key + iterator_.move(resources_); // value return *this; } diff --git a/src/ArduinoJson/Object/JsonPair.hpp b/src/ArduinoJson/Object/JsonPair.hpp index 7a4960b3..7b607fcc 100644 --- a/src/ArduinoJson/Object/JsonPair.hpp +++ b/src/ArduinoJson/Object/JsonPair.hpp @@ -19,7 +19,7 @@ class JsonPair { detail::ResourceManager* resources) { if (!iterator.done()) { key_ = iterator->asString(); - iterator.next(resources); + iterator.move(resources); value_ = JsonVariant(iterator.data(), resources); } } @@ -47,7 +47,7 @@ class JsonPairConst { detail::ResourceManager* resources) { if (!iterator.done()) { key_ = iterator->asString(); - iterator.next(resources); + iterator.move(resources); value_ = JsonVariantConst(iterator.data(), resources); } } diff --git a/src/ArduinoJson/Object/ObjectImpl.hpp b/src/ArduinoJson/Object/ObjectImpl.hpp index 631d56b6..6473930c 100644 --- a/src/ArduinoJson/Object/ObjectImpl.hpp +++ b/src/ArduinoJson/Object/ObjectImpl.hpp @@ -16,7 +16,7 @@ inline VariantData* VariantImpl::getMember(TAdaptedString key, auto it = findKey(key, data, resources); if (it.done()) return nullptr; - it.next(resources); + it.move(resources); return it.data(); } @@ -45,7 +45,7 @@ inline VariantImpl::iterator VariantImpl::findKey(TAdaptedString key, return iterator(); bool isKey = true; for (auto it = createIterator(data, resources); !it.done(); - it.next(resources)) { + it.move(resources)) { if (isKey && stringEquals(key, adaptString(it->asString()))) return it; isKey = !isKey; diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp index 79cf7b50..26bc4a73 100644 --- a/src/ArduinoJson/Variant/VariantImpl.hpp +++ b/src/ArduinoJson/Variant/VariantImpl.hpp @@ -543,7 +543,7 @@ class VariantImpl { size_t n = 0; for (auto it = createIterator(data, resources); !it.done(); - it.next(resources)) + it.move(resources)) n++; if (data->type == VariantType::Object) {