From 0a226652f264c68c216ff6ddc8acf39c83f5729b Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 20 Mar 2022 17:40:12 +0100 Subject: [PATCH] Rename CommonStructuredDataStructEntry to Property --- .../StructuredDataDef/CommonStructuredDataStruct.cpp | 8 ++++---- .../StructuredDataDef/CommonStructuredDataStruct.h | 10 +++++----- .../Sequence/StructuredDataStructScopeSequences.cpp | 2 +- .../StructuredDataDef/StructuredDataDefDumper.cpp | 2 +- .../StructuredDataDef/StructuredDataDefDumper.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp index 1bfd46b8..1c513697 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp @@ -6,18 +6,18 @@ #include "CommonStructuredDataDef.h" #include "Utils/Endianness.h" -CommonStructuredDataStructEntry::CommonStructuredDataStructEntry() +CommonStructuredDataStructProperty::CommonStructuredDataStructProperty() : m_offset_in_bits(0u) { } -CommonStructuredDataStructEntry::CommonStructuredDataStructEntry(std::string name) +CommonStructuredDataStructProperty::CommonStructuredDataStructProperty(std::string name) : m_name(std::move(name)), m_offset_in_bits(0u) { } -CommonStructuredDataStructEntry::CommonStructuredDataStructEntry(std::string name, const CommonStructuredDataType type, const size_t offsetInBits) +CommonStructuredDataStructProperty::CommonStructuredDataStructProperty(std::string name, const CommonStructuredDataType type, const size_t offsetInBits) : m_name(std::move(name)), m_type(type), m_offset_in_bits(offsetInBits) @@ -118,7 +118,7 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat void CommonStructuredDataStruct::SortProperties() { - std::sort(m_properties.begin(), m_properties.end(), [](const CommonStructuredDataStructEntry& e1, const CommonStructuredDataStructEntry& e2) + std::sort(m_properties.begin(), m_properties.end(), [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) { return e1.m_offset_in_bits < e2.m_offset_in_bits; }); diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h index a9ae33f3..8d93f18e 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h @@ -6,22 +6,22 @@ #include "Utils/ClassUtils.h" #include "CommonStructuredDataTypes.h" -struct CommonStructuredDataStructEntry +struct CommonStructuredDataStructProperty { std::string m_name; CommonStructuredDataType m_type; size_t m_offset_in_bits; - CommonStructuredDataStructEntry(); - explicit CommonStructuredDataStructEntry(std::string name); - CommonStructuredDataStructEntry(std::string name, CommonStructuredDataType type, size_t offsetInBits); + CommonStructuredDataStructProperty(); + explicit CommonStructuredDataStructProperty(std::string name); + CommonStructuredDataStructProperty(std::string name, CommonStructuredDataType type, size_t offsetInBits); }; class CommonStructuredDataDef; struct CommonStructuredDataStruct { std::string m_name; - std::vector m_properties; + std::vector m_properties; size_t m_bit_offset; size_t m_size_in_byte; diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp b/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp index 2d5a6ae2..a3edd81a 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp +++ b/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp @@ -281,7 +281,7 @@ namespace sdd::struct_scope_sequences // Sort the entries of the struct alphabetically std::sort(state->m_current_struct->m_properties.begin(), state->m_current_struct->m_properties.end(), - [](const CommonStructuredDataStructEntry& e1, const CommonStructuredDataStructEntry& e2) + [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) { return e1.m_name < e2.m_name; }); diff --git a/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.cpp b/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.cpp index 5d1821eb..014e0b10 100644 --- a/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.cpp +++ b/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.cpp @@ -49,7 +49,7 @@ void StructuredDataDefDumperNew::DumpType(const CommonStructuredDataDef& def, Co typeName = "unknown"; } -void StructuredDataDefDumperNew::DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructEntry& property, unsigned& currentOffsetInBit) +void StructuredDataDefDumperNew::DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructProperty& property, unsigned& currentOffsetInBit) { std::string typeName; std::vector arraySpecifiersInReverseOrder; diff --git a/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.h b/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.h index 44ade372..65f6ab98 100644 --- a/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.h +++ b/src/ObjWriting/StructuredDataDef/StructuredDataDefDumper.h @@ -17,7 +17,7 @@ class StructuredDataDefDumperNew : AbstractTextDumper void DumpEnum(const CommonStructuredDataEnum& _enum); void DumpType(const CommonStructuredDataDef& def, CommonStructuredDataType type, std::string& typeName, std::vector& arraySpecifiersInReverseOrder); - void DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructEntry& property, unsigned& currentOffsetInBit); + void DumpProperty(const CommonStructuredDataDef& def, const CommonStructuredDataStructProperty& property, unsigned& currentOffsetInBit); void DumpStruct(const CommonStructuredDataDef& def, const CommonStructuredDataStruct& _struct, size_t structIndex); public: