From 2e00d909381ece613abda5cdee998291b48d613b Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jeroen@blender.org>
Date: Mon, 3 Jan 2022 10:25:16 +0100
Subject: Cleanup: Renamed to_object_value to to_dictionary_value.

---
 source/blender/blenlib/BLI_serialize.hh    | 7 ++++---
 source/blender/blenlib/intern/serialize.cc | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'source/blender/blenlib')

diff --git a/source/blender/blenlib/BLI_serialize.hh b/source/blender/blenlib/BLI_serialize.hh
index 11ac1c6605b..5945960c450 100644
--- a/source/blender/blenlib/BLI_serialize.hh
+++ b/source/blender/blenlib/BLI_serialize.hh
@@ -177,7 +177,7 @@ class Value {
    * Casts to an DictionaryValue.
    * Will return nullptr when it is a different type.
    */
-  const DictionaryValue *as_object_value() const;
+  const DictionaryValue *as_dictionary_value() const;
 };
 
 /**
@@ -269,13 +269,14 @@ class ContainerValue : public Value {
  * The elements are stored as an key value pair. The value is a shared pointer so it can be shared
  * when using `DictionaryValue::create_lookup`.
  */
-using ObjectElementType = std::pair<std::string, std::shared_ptr<Value>>;
+using DictionaryElementType = std::pair<std::string, std::shared_ptr<Value>>;
 
 /**
  * Object is a key-value container where the key must be a std::string.
  * Internally it is stored in a blender::Vector to ensure the order of keys.
  */
-class DictionaryValue : public ContainerValue<Vector<ObjectElementType>, eValueType::Dictionary> {
+class DictionaryValue
+    : public ContainerValue<Vector<DictionaryElementType>, eValueType::Dictionary> {
  public:
   using LookupValue = std::shared_ptr<Value>;
   using Lookup = Map<std::string, LookupValue>;
diff --git a/source/blender/blenlib/intern/serialize.cc b/source/blender/blenlib/intern/serialize.cc
index 03d08bd20c6..4e7203efe9b 100644
--- a/source/blender/blenlib/intern/serialize.cc
+++ b/source/blender/blenlib/intern/serialize.cc
@@ -44,7 +44,7 @@ const ArrayValue *Value::as_array_value() const
   return static_cast<const ArrayValue *>(this);
 }
 
-const DictionaryValue *Value::as_object_value() const
+const DictionaryValue *Value::as_dictionary_value() const
 {
   if (type_ != eValueType::Dictionary) {
     return nullptr;
@@ -99,7 +99,7 @@ static void convert_to_json(nlohmann::ordered_json &j, const Value &value)
     }
 
     case eValueType::Dictionary: {
-      const DictionaryValue &object = *value.as_object_value();
+      const DictionaryValue &object = *value.as_dictionary_value();
       convert_to_json(j, object);
       break;
     }
-- 
cgit v1.2.3