[Bf-blender-cvs] [d5546057f2a] functions: rename classes

Jacques Lucke noreply at git.blender.org
Mon Aug 5 13:07:51 CEST 2019


Commit: d5546057f2ab511ee6b74a70f30d9547bd9eb9f6
Author: Jacques Lucke
Date:   Mon Aug 5 12:58:31 2019 +0200
Branches: functions
https://developer.blender.org/rBd5546057f2ab511ee6b74a70f30d9547bd9eb9f6

rename classes

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

M	source/blender/functions/CMakeLists.txt
M	source/blender/functions/FN_data_flow_nodes.hpp
M	source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
M	source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp
R100	source/blender/functions/frontends/data_flow_nodes/input_inserters.cpp	source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
R080	source/blender/functions/frontends/data_flow_nodes/input_inserters.hpp	source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.hpp

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

diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 634bc0ccc1f..81afa35f9da 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -147,8 +147,8 @@ set(SRC
   frontends/data_flow_nodes/graph_generation.cpp
   frontends/data_flow_nodes/vtree_data_graph.hpp
   frontends/data_flow_nodes/vtree_data_graph.cpp
-  frontends/data_flow_nodes/input_inserters.hpp
-  frontends/data_flow_nodes/input_inserters.cpp
+  frontends/data_flow_nodes/unlinked_input_inserters.hpp
+  frontends/data_flow_nodes/unlinked_input_inserters.cpp
   frontends/data_flow_nodes/unlinked_input_groupers.hpp
   frontends/data_flow_nodes/unlinked_input_groupers.cpp
   frontends/data_flow_nodes/mappings.hpp
diff --git a/source/blender/functions/FN_data_flow_nodes.hpp b/source/blender/functions/FN_data_flow_nodes.hpp
index 48867c5a023..599ad9b6867 100644
--- a/source/blender/functions/FN_data_flow_nodes.hpp
+++ b/source/blender/functions/FN_data_flow_nodes.hpp
@@ -4,5 +4,5 @@
 #include "frontends/data_flow_nodes/function_generation.hpp"
 #include "frontends/data_flow_nodes/graph_generation.hpp"
 #include "frontends/data_flow_nodes/vtree_data_graph.hpp"
-#include "frontends/data_flow_nodes/input_inserters.hpp"
+#include "frontends/data_flow_nodes/unlinked_input_inserters.hpp"
 #include "frontends/data_flow_nodes/unlinked_input_groupers.hpp"
diff --git a/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
index 2b7e8c96c3b..c64c72b5487 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
@@ -9,14 +9,14 @@ namespace DataFlowNodes {
 
 using BLI::MultiVector;
 
-class InputInserter {
+class UnlinkedInputsInserter {
  public:
   virtual void insert(VTreeDataGraphBuilder &builder,
                       ArrayRef<VirtualSocket *> unlinked_inputs,
                       ArrayRef<BuilderOutputSocket *> r_new_origins) = 0;
 };
 
-class UnlinkedInputGrouper {
+class UnlinkedInputsGrouper {
  public:
   virtual void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) = 0;
 };
diff --git a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp
index 66ee183f356..ff109484c04 100644
--- a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp
@@ -5,27 +5,27 @@
 namespace FN {
 namespace DataFlowNodes {
 
-class SeparateNodeInputs : public UnlinkedInputGrouper {
+class SeparateNodeInputs : public UnlinkedInputsGrouper {
  public:
   void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) override;
 };
 
-class SeparateSocketInputs : public UnlinkedInputGrouper {
+class SeparateSocketInputs : public UnlinkedInputsGrouper {
  public:
   void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) override;
 };
 
-class AllInOneSocketInputs : public UnlinkedInputGrouper {
+class AllInOneSocketInputs : public UnlinkedInputsGrouper {
  public:
   void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) override;
 };
 
-class GroupByNodeUsage : public UnlinkedInputGrouper {
+class GroupByNodeUsage : public UnlinkedInputsGrouper {
  public:
   void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) override;
 };
 
-class GroupBySocketUsage : public UnlinkedInputGrouper {
+class GroupBySocketUsage : public UnlinkedInputsGrouper {
  public:
   void group(VTreeDataGraphBuilder &builder, MultiVector<VirtualSocket *> &r_groups) override;
 };
diff --git a/source/blender/functions/frontends/data_flow_nodes/input_inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
similarity index 100%
rename from source/blender/functions/frontends/data_flow_nodes/input_inserters.cpp
rename to source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
diff --git a/source/blender/functions/frontends/data_flow_nodes/input_inserters.hpp b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.hpp
similarity index 80%
rename from source/blender/functions/frontends/data_flow_nodes/input_inserters.hpp
rename to source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.hpp
index e47c9e92f3f..2788365cb29 100644
--- a/source/blender/functions/frontends/data_flow_nodes/input_inserters.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.hpp
@@ -5,14 +5,14 @@
 namespace FN {
 namespace DataFlowNodes {
 
-class DynamicSocketLoader : public InputInserter {
+class DynamicSocketLoader : public UnlinkedInputsInserter {
  public:
   void insert(VTreeDataGraphBuilder &builder,
               ArrayRef<VirtualSocket *> unlinked_inputs,
               ArrayRef<BuilderOutputSocket *> r_new_origins) override;
 };
 
-class ConstantInputsHandler : public InputInserter {
+class ConstantInputsHandler : public UnlinkedInputsInserter {
  public:
   void insert(VTreeDataGraphBuilder &builder,
               ArrayRef<VirtualSocket *> unlinked_inputs,



More information about the Bf-blender-cvs mailing list