diff options
author | Jacques Lucke <jacques@blender.org> | 2020-04-21 18:38:19 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-04-21 18:38:19 +0300 |
commit | 29e9506a7fbabb441abdf788e190fcaa8f5d0240 (patch) | |
tree | 810a6f8bee711109070c69e8ef35e2922e69c96b | |
parent | 3059353b38ed1fc432cce584afad5bef3b7f2227 (diff) |
BLI: simplify naming of listbase wrapper
-rw-r--r-- | source/blender/blenlib/BLI_listbase_wrapper.hh | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_vector.hh | 9 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.cc | 4 | ||||
-rw-r--r-- | tests/gtests/blenlib/BLI_vector_test.cc | 4 |
4 files changed, 10 insertions, 13 deletions
diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh index 0eee00c87b9..02313d9d22d 100644 --- a/source/blender/blenlib/BLI_listbase_wrapper.hh +++ b/source/blender/blenlib/BLI_listbase_wrapper.hh @@ -29,17 +29,17 @@ namespace BLI { -template<typename T> class IntrusiveListBaseWrapper { +template<typename T> class ListBaseWrapper { private: ListBase *m_listbase; public: - IntrusiveListBaseWrapper(ListBase *listbase) : m_listbase(listbase) + ListBaseWrapper(ListBase *listbase) : m_listbase(listbase) { BLI_assert(listbase); } - IntrusiveListBaseWrapper(ListBase &listbase) : IntrusiveListBaseWrapper(&listbase) + ListBaseWrapper(ListBase &listbase) : ListBaseWrapper(&listbase) { } diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh index 31e046f82e8..a44962e50cc 100644 --- a/source/blender/blenlib/BLI_vector.hh +++ b/source/blender/blenlib/BLI_vector.hh @@ -130,13 +130,10 @@ template<typename T, uint N = 4, typename Allocator = GuardedAllocator> class Ve /** * Create a vector from a ListBase. */ - Vector(ListBase &values, bool intrusive_next_and_prev_pointers) : Vector() + Vector(ListBase &values) : Vector() { - BLI_assert(intrusive_next_and_prev_pointers); - if (intrusive_next_and_prev_pointers) { - for (T value : IntrusiveListBaseWrapper<typename std::remove_pointer<T>::type>(values)) { - this->append(value); - } + for (T value : ListBaseWrapper<typename std::remove_pointer<T>::type>(values)) { + this->append(value); } } diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 31370ddf04e..1f9017b4b18 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -53,7 +53,7 @@ using BLI::Array; using BLI::ArrayRef; using BLI::IndexRange; -using BLI::IntrusiveListBaseWrapper; +using BLI::ListBaseWrapper; using BLI::MutableArrayRef; using BLI::Vector; @@ -93,7 +93,7 @@ static void compute_vertex_mask__armature_mode(MDeformVert *dvert, /* Element i is true if there is a selected bone that uses vertex group i. */ Vector<bool> selected_bone_uses_group; - for (bDeformGroup *def : IntrusiveListBaseWrapper<bDeformGroup>(ob->defbase)) { + for (bDeformGroup *def : ListBaseWrapper<bDeformGroup>(ob->defbase)) { bPoseChannel *pchan = BKE_pose_channel_find_name(armature_ob->pose, def->name); bool bone_for_group_exists = pchan && pchan->bone && (pchan->bone->flag & BONE_SELECTED); selected_bone_uses_group.append(bone_for_group_exists); diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc index 09f007f5eda..1585b77675b 100644 --- a/tests/gtests/blenlib/BLI_vector_test.cc +++ b/tests/gtests/blenlib/BLI_vector_test.cc @@ -45,7 +45,7 @@ struct TestListValue { int value; }; -TEST(vector, IntrusiveListBaseConstructor) +TEST(vector, ListBaseConstructor) { TestListValue *value1 = new TestListValue{0, 0, 4}; TestListValue *value2 = new TestListValue{0, 0, 5}; @@ -55,7 +55,7 @@ TEST(vector, IntrusiveListBaseConstructor) BLI_addtail(&list, value1); BLI_addtail(&list, value2); BLI_addtail(&list, value3); - Vector<TestListValue *> vec(list, true); + Vector<TestListValue *> vec(list); EXPECT_EQ(vec.size(), 3); EXPECT_EQ(vec[0]->value, 4); |