[269c184ac92] master: Cleanup: IO, renamed `delete_object_writer()` → `release_writer()`

[Sybren A. Stüvel]

Commit: 269c184ac925a9f1bfc7ecefb4cc3c333b51ebb0
Author: Sybren A. Stüvel
Date:   Tue Jul 21 14:09:44 2020 +0200
Branches: master
https://developer.blender.org/rB269c184ac925a9f1bfc7ecefb4cc3c333b51ebb0

Cleanup: IO, renamed `delete_object_writer()` → `release_writer()`

The function is called for all writers, not just 'object' writers.
Furthermore, it's called by the function `release_writers()`, so now the
name is consistent with that as well.

No functional changes.

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

M	source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
M	source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
M	source/blender/io/common/IO_abstract_hierarchy_iterator.h
M	source/blender/io/common/intern/abstract_hierarchy_iterator.cc
M	source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
M	source/blender/io/usd/intern/usd_hierarchy_iterator.cc
M	source/blender/io/usd/intern/usd_hierarchy_iterator.h

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

diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
index c83eaf3eede..5b1b1b60b48 100644
--- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
+++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
@@ -89,7 +89,7 @@ bool ABCHierarchyIterator::mark_as_weak_export(const Object *object) const
   return false;
 }
 
-void ABCHierarchyIterator::delete_object_writer(AbstractHierarchyWriter *writer)
+void ABCHierarchyIterator::release_writer(AbstractHierarchyWriter *writer)
 {
   delete writer;
 }
diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
index 3fe2d2c43d2..bd7e3f27c67 100644
--- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
+++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
@@ -78,7 +78,7 @@ class ABCHierarchyIterator : public AbstractHierarchyIterator {
   virtual AbstractHierarchyWriter *create_particle_writer(
       const HierarchyContext *context) override;
 
-  virtual void delete_object_writer(AbstractHierarchyWriter *writer) override;
+  virtual void release_writer(AbstractHierarchyWriter *writer) override;
 
  private:
   Alembic::Abc::OObject get_alembic_parent(const HierarchyContext *context) const;
diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
index 2669f137fd4..a274847e109 100644
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@ -340,7 +340,7 @@ class AbstractHierarchyIterator {
   virtual AbstractHierarchyWriter *create_particle_writer(const HierarchyContext *context) = 0;
 
   /* Called by release_writers() to free what the create_XXX_writer() functions allocated. */
-  virtual void delete_object_writer(AbstractHierarchyWriter *writer) = 0;
+  virtual void release_writer(AbstractHierarchyWriter *writer) = 0;
 
   AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
   ExportChildren &graph_children(const HierarchyContext *parent_context);
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
index 3622c1eb7cd..8c9245ef9b0 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
@@ -165,7 +165,7 @@ void AbstractHierarchyIterator::iterate_and_write()
 void AbstractHierarchyIterator::release_writers()
 {
   for (WriterMap::value_type it : writers_) {
-    delete_object_writer(it.second);
+    release_writer(it.second);
   }
   writers_.clear();
 }
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
index 266c865ee52..ff073416574 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
@@ -91,7 +91,7 @@ class TestingHierarchyIterator : public AbstractHierarchyIterator {
     return new TestHierarchyWriter("particle", particle_writers);
   }
 
-  void delete_object_writer(AbstractHierarchyWriter *writer) override
+  void release_writer(AbstractHierarchyWriter *writer) override
   {
     delete writer;
   }
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
index d0db1284c77..39fbef70e81 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
@@ -61,7 +61,7 @@ bool USDHierarchyIterator::mark_as_weak_export(const Object *object) const
   return false;
 }
 
-void USDHierarchyIterator::delete_object_writer(AbstractHierarchyWriter *writer)
+void USDHierarchyIterator::release_writer(AbstractHierarchyWriter *writer)
 {
   delete static_cast<USDAbstractWriter *>(writer);
 }
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
index 7d750bff0cb..2836ff0b17f 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
@@ -66,7 +66,7 @@ class USDHierarchyIterator : public AbstractHierarchyIterator {
   virtual AbstractHierarchyWriter *create_particle_writer(
       const HierarchyContext *context) override;
 
-  virtual void delete_object_writer(AbstractHierarchyWriter *writer) override;
+  virtual void release_writer(AbstractHierarchyWriter *writer) override;
 
  private:
   USDExporterContext create_usd_export_context(const HierarchyContext *context);