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

[Jacques Lucke]

Commit: f07159485ed795c807e14cc3038391b6f09cf49f
Author: Jacques Lucke
Date:   Sun Apr 11 12:07:52 2021 +0200
Branches: virtual-array-attributes
https://developer.blender.org/rBf07159485ed795c807e14cc3038391b6f09cf49f

cleanup naming

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

M	source/blender/functions/FN_generic_virtual_array.hh
M	source/blender/functions/intern/generic_virtual_array.cc

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

diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh
index f250a98244d..7ffb47a8887 100644
--- a/source/blender/functions/FN_generic_virtual_array.hh
+++ b/source/blender/functions/FN_generic_virtual_array.hh
@@ -535,20 +535,20 @@ template<typename T> class GVMutableArray_For_VMutableArray : public GVMutableAr
   }
 };
 
-class GVArray_As_GSpan final : public GVArray_For_GSpan {
+class GVArray_Span final : public GVArray_For_GSpan {
  private:
   const GVArray &varray_;
   void *owned_data_ = nullptr;
 
  public:
-  GVArray_As_GSpan(const GVArray &varray);
-  ~GVArray_As_GSpan();
+  GVArray_Span(const GVArray &varray);
+  ~GVArray_Span();
 
   GSpan as_span() const;
   operator GSpan() const;
 };
 
-class GVMutableArray_As_GMutableSpan final : public GVMutableArray_For_GMutableSpan {
+class GVMutableArray_Span final : public GVMutableArray_For_GMutableSpan {
  private:
   GVMutableArray &varray_;
   void *owned_data_ = nullptr;
@@ -556,8 +556,8 @@ class GVMutableArray_As_GMutableSpan final : public GVMutableArray_For_GMutableS
   bool show_not_applied_warning_ = true;
 
  public:
-  GVMutableArray_As_GMutableSpan(GVMutableArray &varray);
-  ~GVMutableArray_As_GMutableSpan();
+  GVMutableArray_Span(GVMutableArray &varray);
+  ~GVMutableArray_Span();
 
   void apply();
   void disable_not_applied_warning();
diff --git a/source/blender/functions/intern/generic_virtual_array.cc b/source/blender/functions/intern/generic_virtual_array.cc
index 69cb8912612..9ec8e449b97 100644
--- a/source/blender/functions/intern/generic_virtual_array.cc
+++ b/source/blender/functions/intern/generic_virtual_array.cc
@@ -204,10 +204,10 @@ GVArray_For_SingleValue::~GVArray_For_SingleValue()
 }
 
 /* --------------------------------------------------------------------
- * GVArray_As_GSpan.
+ * GVArray_Span.
  */
 
-GVArray_As_GSpan::GVArray_As_GSpan(const GVArray &varray)
+GVArray_Span::GVArray_Span(const GVArray &varray)
     : GVArray_For_GSpan(varray.type(), varray.size()), varray_(varray)
 {
   if (varray_.is_span()) {
@@ -220,7 +220,7 @@ GVArray_As_GSpan::GVArray_As_GSpan(const GVArray &varray)
   }
 }
 
-GVArray_As_GSpan::~GVArray_As_GSpan()
+GVArray_Span::~GVArray_Span()
 {
   if (owned_data_ != nullptr) {
     type_->destruct_n(owned_data_, size_);
@@ -228,21 +228,21 @@ GVArray_As_GSpan::~GVArray_As_GSpan()
   }
 }
 
-GSpan GVArray_As_GSpan::as_span() const
+GSpan GVArray_Span::as_span() const
 {
   return this->get_span();
 }
 
-GVArray_As_GSpan::operator GSpan() const
+GVArray_Span::operator GSpan() const
 {
   return this->get_span();
 }
 
 /* --------------------------------------------------------------------
- * GVMutableArray_As_GMutableSpan.
+ * GVMutableArray_Span.
  */
 
-GVMutableArray_As_GMutableSpan::GVMutableArray_As_GMutableSpan(GVMutableArray &varray)
+GVMutableArray_Span::GVMutableArray_Span(GVMutableArray &varray)
     : GVMutableArray_For_GMutableSpan(varray.type(), varray.size()), varray_(varray)
 {
   if (varray_.is_span()) {
@@ -255,7 +255,7 @@ GVMutableArray_As_GMutableSpan::GVMutableArray_As_GMutableSpan(GVMutableArray &v
   }
 }
 
-GVMutableArray_As_GMutableSpan::~GVMutableArray_As_GMutableSpan()
+GVMutableArray_Span::~GVMutableArray_Span()
 {
   if (show_not_applied_warning_) {
     if (!apply_has_been_called_) {
@@ -264,7 +264,7 @@ GVMutableArray_As_GMutableSpan::~GVMutableArray_As_GMutableSpan()
   }
 }
 
-void GVMutableArray_As_GMutableSpan::apply()
+void GVMutableArray_Span::apply()
 {
   apply_has_been_called_ = true;
   if (data_ != owned_data_) {
@@ -275,17 +275,17 @@ void GVMutableArray_As_GMutableSpan::apply()
   }
 }
 
-void GVMutableArray_As_GMutableSpan::disable_not_applied_warning()
+void GVMutableArray_Span::disable_not_applied_warning()
 {
   show_not_applied_warning_ = false;
 }
 
-GMutableSpan GVMutableArray_As_GMutableSpan::as_span()
+GMutableSpan GVMutableArray_Span::as_span()
 {
   return this->get_span();
 }
 
-GVMutableArray_As_GMutableSpan::operator GMutableSpan()
+GVMutableArray_Span::operator GMutableSpan()
 {
   return this->get_span();
 }