griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Renamed to_object_value to to_dictionary_value.

Browse Source
This commit is contained in:
Jeroen Bakker
2022-01-03 10:25:16 +01:00
parent e2fdc6226a
commit 2e00d90938
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenlib/BLI_serialize.hh
View File

@@ -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>;

4
source/blender/blenlib/intern/serialize.cc
View File

@@ -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;
}

6
source/blender/editors/asset/intern/asset_indexer.cc
View File

@@ -379,7 +379,7 @@ static int init_indexer_entries_from_value(FileIndexerEntries &indexer_entries,
int num_entries_read = 0;
const ArrayValue::Items elements = (*entries_value)->as_array_value()->elements();
for (ArrayValue::Item element : elements) {
const AssetEntryReader asset_entry(*element->as_object_value());
const AssetEntryReader asset_entry(*element->as_dictionary_value());
FileIndexerEntry *entry = static_cast<FileIndexerEntry *>(
MEM_callocN(sizeof(FileIndexerEntry), __func__));
@@ -564,7 +564,7 @@ struct AssetIndex {
int get_version() const
{
const DictionaryValue *root = contents->as_object_value();
const DictionaryValue *root = contents->as_dictionary_value();
if (root == nullptr) {
return UNKNOWN_VERSION;
}
@@ -588,7 +588,7 @@ struct AssetIndex {
*/
int extract_into(FileIndexerEntries &indexer_entries) const
{
const DictionaryValue *root = contents->as_object_value();
const DictionaryValue *root = contents->as_dictionary_value();
const int num_entries_read = init_indexer_entries_from_value(indexer_entries, *root);
return num_entries_read;
}