From 92d6bae25c54dd4db4e3a92aaeb97b641018c41a Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Thu, 13 Oct 2022 09:41:06 +0200
Subject: [PATCH] Remove `ArrayIterator::internal()` and
 `ObjectIterator::internal()`

---
 CHANGELOG.md                              |  3 ++-
 src/ArduinoJson/Array/ArrayIterator.hpp   | 12 ++++--------
 src/ArduinoJson/Array/ArrayRef.hpp        |  2 +-
 src/ArduinoJson/Object/ObjectIterator.hpp | 12 ++++--------
 src/ArduinoJson/Object/ObjectRef.hpp      |  2 +-
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e60f49..8fec6b86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@ HEAD
 * Remove undocumented `ElementProxy` and `MemberProxy` classes
 * Rename `addElement()` to `add()`
 * Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()`
-* Remove `JsonDocument::data()` and `JsonDocument::memoryPool()`
+* Remove undocumented `JsonDocument::data()` and `JsonDocument::memoryPool()`
+* Remove undocumented `JsonArrayIterator::internal()` and `JsonObjectIterator::internal()`
 
 > ### BREAKING CHANGES
 >
diff --git a/src/ArduinoJson/Array/ArrayIterator.hpp b/src/ArduinoJson/Array/ArrayIterator.hpp
index f74d7be2..8c3494fc 100644
--- a/src/ArduinoJson/Array/ArrayIterator.hpp
+++ b/src/ArduinoJson/Array/ArrayIterator.hpp
@@ -26,6 +26,8 @@ class VariantPtr {
 };
 
 class ArrayIterator {
+  friend class ArrayRef;
+
  public:
   ArrayIterator() : _slot(0) {}
   explicit ArrayIterator(MemoryPool* pool, VariantSlot* slot)
@@ -56,10 +58,6 @@ class ArrayIterator {
     return *this;
   }
 
-  VariantSlot* internal() {
-    return _slot;
-  }
-
  private:
   MemoryPool* _pool;
   VariantSlot* _slot;
@@ -82,6 +80,8 @@ class VariantConstPtr {
 };
 
 class ArrayConstRefIterator {
+  friend class ArrayRef;
+
  public:
   ArrayConstRefIterator() : _slot(0) {}
   explicit ArrayConstRefIterator(const VariantSlot* slot) : _slot(slot) {}
@@ -111,10 +111,6 @@ class ArrayConstRefIterator {
     return *this;
   }
 
-  const VariantSlot* internal() {
-    return _slot;
-  }
-
  private:
   const VariantSlot* _slot;
 };
diff --git a/src/ArduinoJson/Array/ArrayRef.hpp b/src/ArduinoJson/Array/ArrayRef.hpp
index 41d19f1e..036d6662 100644
--- a/src/ArduinoJson/Array/ArrayRef.hpp
+++ b/src/ArduinoJson/Array/ArrayRef.hpp
@@ -159,7 +159,7 @@ class ArrayRef : public ArrayRefBase<CollectionData>,
   FORCE_INLINE void remove(iterator it) const {
     if (!_data)
       return;
-    _data->removeSlot(it.internal());
+    _data->removeSlot(it._slot);
   }
 
   // Removes element at specified index.
diff --git a/src/ArduinoJson/Object/ObjectIterator.hpp b/src/ArduinoJson/Object/ObjectIterator.hpp
index e20a48d2..b41f302e 100644
--- a/src/ArduinoJson/Object/ObjectIterator.hpp
+++ b/src/ArduinoJson/Object/ObjectIterator.hpp
@@ -26,6 +26,8 @@ class PairPtr {
 };
 
 class ObjectIterator {
+  friend class ObjectRef;
+
  public:
   ObjectIterator() : _slot(0) {}
 
@@ -57,10 +59,6 @@ class ObjectIterator {
     return *this;
   }
 
-  VariantSlot* internal() {
-    return _slot;
-  }
-
  private:
   MemoryPool* _pool;
   VariantSlot* _slot;
@@ -83,6 +81,8 @@ class PairConstPtr {
 };
 
 class ObjectConstIterator {
+  friend class ObjectRef;
+
  public:
   ObjectConstIterator() : _slot(0) {}
 
@@ -113,10 +113,6 @@ class ObjectConstIterator {
     return *this;
   }
 
-  const VariantSlot* internal() {
-    return _slot;
-  }
-
  private:
   const VariantSlot* _slot;
 };
diff --git a/src/ArduinoJson/Object/ObjectRef.hpp b/src/ArduinoJson/Object/ObjectRef.hpp
index 6e93361b..f9c57984 100644
--- a/src/ArduinoJson/Object/ObjectRef.hpp
+++ b/src/ArduinoJson/Object/ObjectRef.hpp
@@ -176,7 +176,7 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
   FORCE_INLINE void remove(iterator it) const {
     if (!_data)
       return;
-    _data->removeSlot(it.internal());
+    _data->removeSlot(it._slot);
   }
 
   // remove(const std::string&) const