[Bf-blender-cvs] [81a5c6f8260] virtual-array-attributes: cleanup naming

[Jacques Lucke]

Commit: 81a5c6f8260ea1bed0e8ec2c03163dc12a260a52
Author: Jacques Lucke
Date:   Sun Apr 11 12:05:46 2021 +0200
Branches: virtual-array-attributes
https://developer.blender.org/rB81a5c6f8260ea1bed0e8ec2c03163dc12a260a52

cleanup naming

===================================================================

M	source/blender/blenlib/BLI_virtual_array.hh
M	source/blender/blenlib/tests/BLI_virtual_array_test.cc

===================================================================

diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh
index 81142a0cabb..3da03e8e171 100644
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -379,13 +379,13 @@ template<typename T> class VArray_For_Single final : public VArray<T> {
  *    from faster access.
  *  - An API is called, that does not accept virtual arrays, but only spans.
  */
-template<typename T> class VArray_As_Span final : public VArray_For_Span<T> {
+template<typename T> class VArray_Span final : public VArray_For_Span<T> {
  private:
   const VArray<T> &varray_;
   Array<T> owned_data_;
 
  public:
-  VArray_As_Span(const VArray<T> &varray) : VArray_For_Span<T>(varray.size()), varray_(varray)
+  VArray_Span(const VArray<T> &varray) : VArray_For_Span<T>(varray.size()), varray_(varray)
   {
     if (varray_.is_span()) {
       this->data_ = varray_.get_span().data();
@@ -409,8 +409,7 @@ template<typename T> class VArray_As_Span final : public VArray_For_Span<T> {
   }
 };
 
-template<typename T>
-class VMutableArray_As_MutableSpan final : public VMutableArray_For_MutableSpan<T> {
+template<typename T> class VMutableArray_Span final : public VMutableArray_For_MutableSpan<T> {
  private:
   VMutableArray<T> &varray_;
   Array<T> owned_data_;
@@ -418,8 +417,7 @@ class VMutableArray_As_MutableSpan final : public VMutableArray_For_MutableSpan<
   bool show_not_applied_warning_ = true;
 
  public:
-  VMutableArray_As_MutableSpan(VMutableArray<T> &varray)
-      : VMutableArray_For_MutableSpan<T>(varray.size())
+  VMutableArray_Span(VMutableArray<T> &varray) : VMutableArray_For_MutableSpan<T>(varray.size())
   {
     if (varray_.is_span()) {
       this->data_ = varray_.get_span().data();
@@ -432,7 +430,7 @@ class VMutableArray_As_MutableSpan final : public VMutableArray_For_MutableSpan<
     }
   }
 
-  ~VMutableArray_As_MutableSpan()
+  ~VMutableArray_Span()
   {
     if (show_not_applied_warning_) {
       if (!apply_has_been_called_) {
diff --git a/source/blender/blenlib/tests/BLI_virtual_array_test.cc b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
index ed4f2720914..059f9f2d5d1 100644
--- a/source/blender/blenlib/tests/BLI_virtual_array_test.cc
+++ b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
@@ -109,7 +109,7 @@ TEST(virtual_array, AsSpan)
 {
   auto func = [](int64_t index) { return (int)(10 * index); };
   VArray_For_Func<int, decltype(func)> func_varray{10, func};
-  VArray_As_Span span_varray{func_varray};
+  VArray_Span span_varray{func_varray};
   EXPECT_EQ(span_varray.size(), 10);
   Span<int> span = span_varray;
   EXPECT_EQ(span.size(), 10);