CollectionIterator: rename next() to move()

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -16,7 +16,7 @@ inline VariantImpl::iterator VariantImpl::at(size_t index) const {
 
   auto it = createIterator();
   while (!it.done() && index) {
-    it.next();
+    it.move();
     --index;
   }
   return it;
@@ -35,7 +35,7 @@ inline VariantData* VariantImpl::addElement() {
 inline VariantData* VariantImpl::getOrAddElement(size_t index) {
   auto it = createIterator();
   while (!it.done() && index > 0) {
-    it.next();
+    it.move();
     index--;
   }
   if (it.done())

src/ArduinoJson/Array/JsonArrayIterator.hpp

@@ -50,7 +50,7 @@ class JsonArrayIterator {
   }
 
   JsonArrayIterator& operator++() {
-    iterator_.next();
+    iterator_.move();
     return *this;
   }
 
@@ -82,7 +82,7 @@ class JsonArrayConstIterator {
   }
 
   JsonArrayConstIterator& operator++() {
-    iterator_.next();
+    iterator_.move();
     return *this;
   }
 

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -98,7 +98,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()) {
+  for (auto it = createIterator(); !it.done(); it.move()) {
     auto childNesting = it->nesting();
     if (childNesting > maxChildNesting)
       maxChildNesting = childNesting;
@@ -112,7 +112,7 @@ inline size_t VariantImpl::size() const {
 
   size_t count = 0;
 
-  for (auto it = createIterator(); !it.done(); it.next())
+  for (auto it = createIterator(); !it.done(); it.move())
     count++;
 
   if (data_->type == VariantType::Object)

src/ArduinoJson/Collection/CollectionIterator.hpp

@@ -17,7 +17,7 @@ class CollectionIterator {
   CollectionIterator(SlotId slotId, ResourceManager* resources)
       : value_(resources->getVariant(slotId), resources), slotId_(slotId) {}
 
-  void next() {
+  void move() {
     ARDUINOJSON_ASSERT(!done());
     auto nextId = value_.data()->next;
     auto resources = value_.resources();

src/ArduinoJson/Json/PrettyJsonSerializer.hpp

@@ -27,7 +27,7 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
       while (!it.done()) {
         indent();
         it->accept(*this);
-        it.next();
+        it.move();
         base::write(it.done() ? "\r\n" : ",\r\n");
       }
       nesting_--;
@@ -49,7 +49,7 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
         if (isKey)
           indent();
         it->accept(*this);
-        it.next();
+        it.move();
         if (isKey)
           base::write(": ");
         else

src/ArduinoJson/Object/JsonObjectIterator.hpp

@@ -33,8 +33,8 @@ class JsonObjectIterator {
   }
 
   JsonObjectIterator& operator++() {
-    iterator_.next();  // key
-    iterator_.next();  // value
+    iterator_.move();  // key
+    iterator_.move();  // value
     return *this;
   }
 
@@ -68,8 +68,8 @@ class JsonObjectConstIterator {
   }
 
   JsonObjectConstIterator& operator++() {
-    iterator_.next();  // key
-    iterator_.next();  // value
+    iterator_.move();  // key
+    iterator_.move();  // value
     return *this;
   }
 

src/ArduinoJson/Object/JsonPair.hpp

@@ -18,7 +18,7 @@ class JsonPair {
   JsonPair(detail::VariantImpl::iterator iterator) {
     if (!iterator.done()) {
       key_ = iterator->asString();
-      iterator.next();
+      iterator.move();
       value_ = JsonVariant(*iterator);
     }
   }
@@ -45,7 +45,7 @@ class JsonPairConst {
   JsonPairConst(detail::VariantImpl::iterator iterator) {
     if (!iterator.done()) {
       key_ = iterator->asString();
-      iterator.next();
+      iterator.move();
       value_ = JsonVariantConst(*iterator);
     }
   }

src/ArduinoJson/Object/ObjectImpl.hpp

@@ -14,7 +14,7 @@ inline VariantData* VariantImpl::getMember(TAdaptedString key) const {
   auto it = findKey(key);
   if (it.done())
     return nullptr;
-  it.next();
+  it.move();
   return it->data();
 }
 
@@ -33,7 +33,7 @@ inline VariantImpl::iterator VariantImpl::findKey(TAdaptedString key) const {
   if (key.isNull())
     return iterator();
   bool isKey = true;
-  for (auto it = createIterator(); !it.done(); it.next()) {
+  for (auto it = createIterator(); !it.done(); it.move()) {
     if (isKey && stringEquals(key, adaptString(it->asString())))
       return it;
     isKey = !isKey;