From e2fdc6226a9f58afe1024b832989ede2c211124e Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jeroen@blender.org>
Date: Mon, 3 Jan 2022 10:23:09 +0100
Subject: Cleanup: rename ValueType.Object to ValueType.Dictionary.

---
 source/blender/blenlib/intern/serialize.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source/blender/blenlib/intern')

diff --git a/source/blender/blenlib/intern/serialize.cc b/source/blender/blenlib/intern/serialize.cc
index a17d7a189f6..03d08bd20c6 100644
--- a/source/blender/blenlib/intern/serialize.cc
+++ b/source/blender/blenlib/intern/serialize.cc
@@ -46,7 +46,7 @@ const ArrayValue *Value::as_array_value() const
 
 const DictionaryValue *Value::as_object_value() const
 {
-  if (type_ != eValueType::Object) {
+  if (type_ != eValueType::Dictionary) {
     return nullptr;
   }
   return static_cast<const DictionaryValue *>(this);
@@ -98,7 +98,7 @@ static void convert_to_json(nlohmann::ordered_json &j, const Value &value)
       break;
     }
 
-    case eValueType::Object: {
+    case eValueType::Dictionary: {
       const DictionaryValue &object = *value.as_object_value();
       convert_to_json(j, object);
       break;
@@ -133,7 +133,8 @@ static std::unique_ptr<ArrayValue> convert_from_json_to_array(const nlohmann::or
   return array;
 }
 
-static std::unique_ptr<DictionaryValue> convert_from_json_to_object(const nlohmann::ordered_json &j)
+static std::unique_ptr<DictionaryValue> convert_from_json_to_object(
+    const nlohmann::ordered_json &j)
 {
   std::unique_ptr<DictionaryValue> object = std::make_unique<DictionaryValue>();
   DictionaryValue::Items &elements = object->elements();
-- 
cgit v1.2.3