VariantImpl: rename getResourceManager() to resources()

Author: bblanchon

src/ArduinoJson/Array/JsonArray.hpp

@@ -56,7 +56,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   template <typename T, detail::enable_if_t<
                             detail::is_same<T, JsonVariant>::value, int> = 0>
   JsonVariant add() const {
-    return JsonVariant(impl_.addNewElement(), impl_.getResourceManager());
+    return JsonVariant(impl_.addNewElement(), impl_.resources());
   }
 
   // Appends a value to the array.
@@ -65,7 +65,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   bool add(const T& value) const {
     if (!impl_.isArray())
       return false;
-    return addValue(value, impl_.data(), impl_.getResourceManager());
+    return addValue(value, impl_.data(), impl_.resources());
   }
 
   // Appends a value to the array.
@@ -75,13 +75,13 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   bool add(T* value) const {
     if (!impl_.isArray())
       return false;
-    return addValue(value, impl_.data(), impl_.getResourceManager());
+    return addValue(value, impl_.data(), impl_.resources());
   }
 
   // Returns an iterator to the first element of the array.
   // https://arduinojson.org/v7/api/jsonarray/begin/
   iterator begin() const {
-    return iterator(impl_.createIterator(), impl_.getResourceManager());
+    return iterator(impl_.createIterator(), impl_.resources());
   }
 
   // Returns an iterator following the last element of the array.
@@ -200,7 +200,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
 
  private:
   detail::ResourceManager* getResourceManager() const {
-    return impl_.getResourceManager();
+    return impl_.resources();
   }
 
   detail::VariantData* getData() const {

src/ArduinoJson/Array/JsonArrayConst.hpp

@@ -24,7 +24,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   // Returns an iterator to the first element of the array.
   // https://arduinojson.org/v7/api/jsonarrayconst/begin/
   iterator begin() const {
-    return iterator(impl_.createIterator(), impl_.getResourceManager());
+    return iterator(impl_.createIterator(), impl_.resources());
   }
 
   // Returns an iterator to the element following the last element of the array.
@@ -48,8 +48,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   template <typename T,
             detail::enable_if_t<detail::is_integral<T>::value, int> = 0>
   JsonVariantConst operator[](T index) const {
-    return JsonVariantConst(impl_.getElement(size_t(index)),
-                            impl_.getResourceManager());
+    return JsonVariantConst(impl_.getElement(size_t(index)), impl_.resources());
   }
 
   // Returns the element at the specified index.
@@ -64,7 +63,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   }
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(impl_.data(), impl_.getResourceManager());
+    return JsonVariantConst(impl_.data(), impl_.resources());
   }
 
   // Returns true if the reference is unbound.

src/ArduinoJson/Object/JsonObject.hpp

@@ -68,7 +68,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Returns an iterator to the first key-value pair of the object.
   // https://arduinojson.org/v7/api/jsonobject/begin/
   iterator begin() const {
-    return iterator(impl_.createIterator(), impl_.getResourceManager());
+    return iterator(impl_.createIterator(), impl_.resources());
   }
 
   // Returns an iterator following the last key-value pair of the object.
@@ -222,7 +222,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
 
  private:
   detail::ResourceManager* getResourceManager() const {
-    return impl_.getResourceManager();
+    return impl_.resources();
   }
 
   detail::VariantData* getData() const {

src/ArduinoJson/Object/JsonObjectConst.hpp

@@ -29,7 +29,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   JsonObjectConst(const detail::VariantImpl& impl) : impl_(impl) {}
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(impl_.data(), impl_.getResourceManager());
+    return JsonVariantConst(impl_.data(), impl_.resources());
   }
 
   // Returns true if the reference is unbound.
@@ -59,7 +59,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   // Returns an iterator to the first key-value pair of the object.
   // https://arduinojson.org/v7/api/jsonobjectconst/begin/
   iterator begin() const {
-    return iterator(impl_.createIterator(), impl_.getResourceManager());
+    return iterator(impl_.createIterator(), impl_.resources());
   }
 
   // Returns an iterator following the last key-value pair of the object.
@@ -100,7 +100,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
             detail::enable_if_t<detail::IsString<TString>::value, int> = 0>
   JsonVariantConst operator[](const TString& key) const {
     return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
-                            impl_.getResourceManager());
+                            impl_.resources());
   }
 
   // Gets the member with specified key.
@@ -111,7 +111,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
                                 int> = 0>
   JsonVariantConst operator[](TChar* key) const {
     return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
-                            impl_.getResourceManager());
+                            impl_.resources());
   }
 
   // Gets the member with specified key.

src/ArduinoJson/Variant/JsonVariant.hpp

@@ -27,7 +27,7 @@ class JsonVariant : public detail::VariantRefBase<JsonVariant>,
 
  private:
   detail::ResourceManager* getResourceManager() const {
-    return impl_.getResourceManager();
+    return impl_.resources();
   }
 
   detail::VariantData* getData() const {

src/ArduinoJson/Variant/JsonVariantConst.hpp

@@ -104,8 +104,7 @@ class JsonVariantConst : public detail::VariantTag,
   template <typename T,
             detail::enable_if_t<detail::is_integral<T>::value, int> = 0>
   JsonVariantConst operator[](T index) const {
-    return JsonVariantConst(impl_.getElement(size_t(index)),
-                            impl_.getResourceManager());
+    return JsonVariantConst(impl_.getElement(size_t(index)), impl_.resources());
   }
 
   // Gets object's member with specified key.
@@ -114,7 +113,7 @@ class JsonVariantConst : public detail::VariantTag,
             detail::enable_if_t<detail::IsString<TString>::value, int> = 0>
   JsonVariantConst operator[](const TString& key) const {
     return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
-                            impl_.getResourceManager());
+                            impl_.resources());
   }
 
   // Gets object's member with specified key.
@@ -125,7 +124,7 @@ class JsonVariantConst : public detail::VariantTag,
                                 int> = 0>
   JsonVariantConst operator[](TChar* key) const {
     return JsonVariantConst(impl_.getMember(detail::adaptString(key)),
-                            impl_.getResourceManager());
+                            impl_.resources());
   }
 
   // Gets object's member with specified key or the array's element at the
@@ -181,7 +180,7 @@ class JsonVariantConst : public detail::VariantTag,
   }
 
   detail::ResourceManager* getResourceManager() const {
-    return impl_.getResourceManager();
+    return impl_.resources();
   }
 
  private:

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -29,7 +29,7 @@ class VariantImpl {
     return data_;
   }
 
-  ResourceManager* getResourceManager() const {
+  ResourceManager* resources() const {
     return resources_;
   }