From 2f2e0e9415d53f77ca9e0d37c0e2736f74fc45b5 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Mon, 19 Dec 2022 11:41:14 +0100
Subject: [PATCH] Rename `ObjectIterator` to `JsonObjectIterator`

---
 src/ArduinoJson/Object/JsonObject.hpp         |  3 +-
 src/ArduinoJson/Object/JsonObjectConst.hpp    |  4 +--
 ...ectIterator.hpp => JsonObjectIterator.hpp} | 28 +++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)
 rename src/ArduinoJson/Object/{ObjectIterator.hpp => JsonObjectIterator.hpp} (70%)

diff --git a/src/ArduinoJson/Object/JsonObject.hpp b/src/ArduinoJson/Object/JsonObject.hpp
index 3ea32d73..58e6c5dc 100644
--- a/src/ArduinoJson/Object/JsonObject.hpp
+++ b/src/ArduinoJson/Object/JsonObject.hpp
@@ -7,7 +7,6 @@
 #include <ArduinoJson/Object/JsonObjectConst.hpp>
 #include <ArduinoJson/Object/MemberProxy.hpp>
 
-
 namespace ARDUINOJSON_NAMESPACE {
 
 class JsonArray;
@@ -16,7 +15,7 @@ class JsonObject : public VariantOperators<JsonObject> {
   friend class VariantAttorney;
 
  public:
-  typedef ObjectIterator iterator;
+  typedef JsonObjectIterator iterator;
 
   FORCE_INLINE JsonObject() : _data(0), _pool(0) {}
   FORCE_INLINE JsonObject(MemoryPool* buf, CollectionData* data)
diff --git a/src/ArduinoJson/Object/JsonObjectConst.hpp b/src/ArduinoJson/Object/JsonObjectConst.hpp
index 4b300452..b4c70fd5 100644
--- a/src/ArduinoJson/Object/JsonObjectConst.hpp
+++ b/src/ArduinoJson/Object/JsonObjectConst.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Object/ObjectIterator.hpp>
+#include <ArduinoJson/Object/JsonObjectIterator.hpp>
 #include <ArduinoJson/Variant/VariantOperators.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
@@ -14,7 +14,7 @@ class JsonObjectConst : public VariantOperators<JsonObjectConst> {
   friend class VariantAttorney;
 
  public:
-  typedef ObjectConstIterator iterator;
+  typedef JsonObjectConstIterator iterator;
 
   JsonObjectConst() : _data(0) {}
   JsonObjectConst(const CollectionData* data) : _data(data) {}
diff --git a/src/ArduinoJson/Object/ObjectIterator.hpp b/src/ArduinoJson/Object/JsonObjectIterator.hpp
similarity index 70%
rename from src/ArduinoJson/Object/ObjectIterator.hpp
rename to src/ArduinoJson/Object/JsonObjectIterator.hpp
index adc18f18..b01babb0 100644
--- a/src/ArduinoJson/Object/ObjectIterator.hpp
+++ b/src/ArduinoJson/Object/JsonObjectIterator.hpp
@@ -25,13 +25,13 @@ class JsonPairPtr {
   JsonPair _pair;
 };
 
-class ObjectIterator {
+class JsonObjectIterator {
   friend class JsonObject;
 
  public:
-  ObjectIterator() : _slot(0) {}
+  JsonObjectIterator() : _slot(0) {}
 
-  explicit ObjectIterator(MemoryPool* pool, VariantSlot* slot)
+  explicit JsonObjectIterator(MemoryPool* pool, VariantSlot* slot)
       : _pool(pool), _slot(slot) {}
 
   JsonPair operator*() const {
@@ -41,20 +41,20 @@ class ObjectIterator {
     return JsonPairPtr(_pool, _slot);
   }
 
-  bool operator==(const ObjectIterator& other) const {
+  bool operator==(const JsonObjectIterator& other) const {
     return _slot == other._slot;
   }
 
-  bool operator!=(const ObjectIterator& other) const {
+  bool operator!=(const JsonObjectIterator& other) const {
     return _slot != other._slot;
   }
 
-  ObjectIterator& operator++() {
+  JsonObjectIterator& operator++() {
     _slot = _slot->next();
     return *this;
   }
 
-  ObjectIterator& operator+=(size_t distance) {
+  JsonObjectIterator& operator+=(size_t distance) {
     _slot = _slot->next(distance);
     return *this;
   }
@@ -80,13 +80,13 @@ class JsonPairConstPtr {
   JsonPairConst _pair;
 };
 
-class ObjectConstIterator {
+class JsonObjectConstIterator {
   friend class JsonObject;
 
  public:
-  ObjectConstIterator() : _slot(0) {}
+  JsonObjectConstIterator() : _slot(0) {}
 
-  explicit ObjectConstIterator(const VariantSlot* slot) : _slot(slot) {}
+  explicit JsonObjectConstIterator(const VariantSlot* slot) : _slot(slot) {}
 
   JsonPairConst operator*() const {
     return JsonPairConst(_slot);
@@ -95,20 +95,20 @@ class ObjectConstIterator {
     return JsonPairConstPtr(_slot);
   }
 
-  bool operator==(const ObjectConstIterator& other) const {
+  bool operator==(const JsonObjectConstIterator& other) const {
     return _slot == other._slot;
   }
 
-  bool operator!=(const ObjectConstIterator& other) const {
+  bool operator!=(const JsonObjectConstIterator& other) const {
     return _slot != other._slot;
   }
 
-  ObjectConstIterator& operator++() {
+  JsonObjectConstIterator& operator++() {
     _slot = _slot->next();
     return *this;
   }
 
-  ObjectConstIterator& operator+=(size_t distance) {
+  JsonObjectConstIterator& operator+=(size_t distance) {
     _slot = _slot->next(distance);
     return *this;
   }