[Bf-blender-cvs] [9c202412728] functions: simplify names

[Jacques Lucke]

Commit: 9c202412728c8b82f8bae15514c09b1a66d78977
Author: Jacques Lucke
Date:   Sat Jan 4 13:26:17 2020 +0100
Branches: functions
https://developer.blender.org/rB9c202412728c8b82f8bae15514c09b1a66d78977

simplify names

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

M	source/blender/functions/intern/node_tree_multi_function_network/builder.cc
M	source/blender/functions/intern/node_tree_multi_function_network/builder.h
M	source/blender/functions/intern/node_tree_multi_function_network/generate.cc

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

diff --git a/source/blender/functions/intern/node_tree_multi_function_network/builder.cc b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
index 542aca335d5..e8dd9fef32e 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
@@ -5,20 +5,20 @@ namespace MFGeneration {
 
 using BLI::ScopedVector;
 
-MFBuilderFunctionNode &FunctionTreeMFBuilderBase::add_function(const MultiFunction &function)
+MFBuilderFunctionNode &CommonBuilderBase::add_function(const MultiFunction &function)
 {
   return m_common.network_builder.add_function(function);
 }
 
-MFBuilderFunctionNode &FunctionTreeMFBuilderBase::add_function(const MultiFunction &function,
-                                                               const FNode &fnode)
+MFBuilderFunctionNode &CommonBuilderBase::add_function(const MultiFunction &function,
+                                                       const FNode &fnode)
 {
   MFBuilderFunctionNode &node = m_common.network_builder.add_function(function);
   m_common.socket_map.add(fnode, node, m_common.fsocket_data_types);
   return node;
 }
 
-MFBuilderDummyNode &FunctionTreeMFBuilderBase::add_dummy(const FNode &fnode)
+MFBuilderDummyNode &CommonBuilderBase::add_dummy(const FNode &fnode)
 {
   ScopedVector<MFDataType> input_types;
   ScopedVector<StringRef> input_names;
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/builder.h b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
index 565f1909ef2..4a51a0eb76e 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.h
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
@@ -177,7 +177,7 @@ class MFSocketByFSocketMapping {
   }
 };
 
-struct FunctionTreeMFBuilderCommonData {
+struct CommonBuilderData {
   ResourceCollector &resources;
   const VTreeMultiFunctionMappings &mappings;
   const FSocketDataTypes &fsocket_data_types;
@@ -186,16 +186,16 @@ struct FunctionTreeMFBuilderCommonData {
   const FunctionTree &function_tree;
 };
 
-class FunctionTreeMFBuilderBase {
+class CommonBuilderBase {
  protected:
-  FunctionTreeMFBuilderCommonData &m_common;
+  CommonBuilderData &m_common;
 
  public:
-  FunctionTreeMFBuilderBase(FunctionTreeMFBuilderCommonData &common) : m_common(common)
+  CommonBuilderBase(CommonBuilderData &common) : m_common(common)
   {
   }
 
-  FunctionTreeMFBuilderCommonData &common()
+  CommonBuilderData &common()
   {
     return m_common;
   }
@@ -277,14 +277,14 @@ class FunctionTreeMFBuilderBase {
   }
 };
 
-class VSocketMFNetworkBuilder : public FunctionTreeMFBuilderBase {
+class VSocketMFNetworkBuilder : public CommonBuilderBase {
  private:
   const VSocket &m_vsocket;
   MFBuilderOutputSocket *m_socket_to_build = nullptr;
 
  public:
-  VSocketMFNetworkBuilder(FunctionTreeMFBuilderCommonData &common, const VSocket &vsocket)
-      : FunctionTreeMFBuilderBase(common), m_vsocket(vsocket)
+  VSocketMFNetworkBuilder(CommonBuilderData &common, const VSocket &vsocket)
+      : CommonBuilderBase(common), m_vsocket(vsocket)
   {
   }
 
@@ -322,16 +322,16 @@ class VSocketMFNetworkBuilder : public FunctionTreeMFBuilderBase {
   }
 };
 
-class FNodeMFNetworkBuilder : public FunctionTreeMFBuilderBase {
+class FNodeMFNetworkBuilder : public CommonBuilderBase {
  private:
   const FNode &m_fnode;
 
-  using FunctionTreeMFBuilderBase::cpp_type_from_property;
-  using FunctionTreeMFBuilderBase::data_type_from_property;
+  using CommonBuilderBase::cpp_type_from_property;
+  using CommonBuilderBase::data_type_from_property;
 
  public:
-  FNodeMFNetworkBuilder(FunctionTreeMFBuilderCommonData &common, const FNode &fnode)
-      : FunctionTreeMFBuilderBase(common), m_fnode(fnode)
+  FNodeMFNetworkBuilder(CommonBuilderData &common, const FNode &fnode)
+      : CommonBuilderBase(common), m_fnode(fnode)
   {
   }
 
@@ -386,14 +386,13 @@ class FNodeMFNetworkBuilder : public FunctionTreeMFBuilderBase {
                                                ArrayRef<const char *> is_vectorized_prop_names);
 };
 
-class ImplicitConversionMFBuilder : public FunctionTreeMFBuilderBase {
+class ImplicitConversionMFBuilder : public CommonBuilderBase {
  private:
   MFBuilderInputSocket *m_built_input = nullptr;
   MFBuilderOutputSocket *m_built_output = nullptr;
 
  public:
-  ImplicitConversionMFBuilder(FunctionTreeMFBuilderCommonData &common)
-      : FunctionTreeMFBuilderBase(common)
+  ImplicitConversionMFBuilder(CommonBuilderData &common) : CommonBuilderBase(common)
   {
   }
 
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
index acfe361937d..c2fb1693820 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
@@ -11,7 +11,7 @@
 namespace FN {
 namespace MFGeneration {
 
-static bool insert_nodes(FunctionTreeMFBuilderCommonData &common)
+static bool insert_nodes(CommonBuilderData &common)
 {
   for (const FNode *fnode : common.function_tree.all_nodes()) {
     StringRef idname = fnode->idname();
@@ -22,7 +22,7 @@ static bool insert_nodes(FunctionTreeMFBuilderCommonData &common)
       (*inserter)(fnode_builder);
     }
     else if (common.fsocket_data_types.has_data_sockets(*fnode)) {
-      FunctionTreeMFBuilderBase builder{common};
+      CommonBuilderBase builder{common};
       builder.add_dummy(*fnode);
     }
   }
@@ -40,7 +40,7 @@ static bool insert_nodes(FunctionTreeMFBuilderCommonData &common)
   return true;
 }
 
-static bool insert_links(FunctionTreeMFBuilderCommonData &common)
+static bool insert_links(CommonBuilderData &common)
 {
   for (const FInputSocket *to_fsocket : common.function_tree.all_input_sockets()) {
     if (!common.fsocket_data_types.is_data_socket(*to_fsocket)) {
@@ -97,7 +97,7 @@ static bool insert_links(FunctionTreeMFBuilderCommonData &common)
   return true;
 }
 
-static bool insert_unlinked_inputs(FunctionTreeMFBuilderCommonData &common)
+static bool insert_unlinked_inputs(CommonBuilderData &common)
 {
   Vector<const FInputSocket *> unlinked_data_inputs;
   for (const FInputSocket *fsocket : common.function_tree.all_input_sockets()) {
@@ -163,7 +163,7 @@ std::unique_ptr<FunctionTreeMFNetwork> generate_node_tree_multi_function_network
   MFSocketByFSocketMapping socket_map{function_tree};
   auto network_builder = BLI::make_unique<MFNetworkBuilder>();
 
-  FunctionTreeMFBuilderCommonData common{
+  CommonBuilderData common{
       resources, mappings, fsocket_data_types, socket_map, *network_builder, function_tree};
   if (!insert_nodes(common)) {
     BLI_assert(false);