[Bf-blender-cvs] [b80000f0735] functions: rename BNodeTreeLookup to NodeTreeQuery

[Jacques Lucke]

Commit: b80000f073585d0bbc9031104d707e658a14e51f
Author: Jacques Lucke
Date:   Wed Jul 3 15:36:32 2019 +0200
Branches: functions
https://developer.blender.org/rBb80000f073585d0bbc9031104d707e658a14e51f

rename BNodeTreeLookup to NodeTreeQuery

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

M	source/blender/blenkernel/BKE_node_tree.hpp
M	source/blender/blenkernel/intern/node_tree.cpp
M	source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
M	source/blender/simulations/bparticles/c_wrapper.cpp

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

diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_node_tree.hpp
index 32a66590cd6..9f9fce36601 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -22,9 +22,9 @@ using bNodeList = ListBaseWrapper<struct bNode *, true>;
 using bLinkList = ListBaseWrapper<struct bNodeLink *, true>;
 using bSocketList = ListBaseWrapper<struct bNodeSocket *, true>;
 
-class BNodeTreeLookup {
+class NodeTreeQuery {
  public:
-  BNodeTreeLookup(bNodeTree *btree);
+  NodeTreeQuery(bNodeTree *btree);
 
   struct SingleOriginLink {
     bNodeSocket *from;
diff --git a/source/blender/blenkernel/intern/node_tree.cpp b/source/blender/blenkernel/intern/node_tree.cpp
index 0427b49f0ad..a2de8dc7db5 100644
--- a/source/blender/blenkernel/intern/node_tree.cpp
+++ b/source/blender/blenkernel/intern/node_tree.cpp
@@ -2,7 +2,7 @@
 
 namespace BKE {
 
-BNodeTreeLookup::BNodeTreeLookup(bNodeTree *btree) : m_nodes(btree->nodes, true)
+NodeTreeQuery::NodeTreeQuery(bNodeTree *btree) : m_nodes(btree->nodes, true)
 {
   for (bNode *bnode : m_nodes) {
     for (bNodeSocket *bsocket : bSocketList(&bnode->inputs)) {
@@ -31,7 +31,7 @@ BNodeTreeLookup::BNodeTreeLookup(bNodeTree *btree) : m_nodes(btree->nodes, true)
   }
 }
 
-bNodeSocket *BNodeTreeLookup::try_find_single_origin(bNodeSocket *bsocket)
+bNodeSocket *NodeTreeQuery::try_find_single_origin(bNodeSocket *bsocket)
 {
   BLI_assert(bsocket->in_out == SOCK_IN);
   if (m_direct_links.values_for_key(bsocket) == 1) {
@@ -49,12 +49,12 @@ bNodeSocket *BNodeTreeLookup::try_find_single_origin(bNodeSocket *bsocket)
   }
 }
 
-bool BNodeTreeLookup::is_reroute(bNode *bnode)
+bool NodeTreeQuery::is_reroute(bNode *bnode)
 {
   return STREQ(bnode->idname, "NodeReroute");
 }
 
-SmallVector<bNode *> BNodeTreeLookup::nodes_with_idname(StringRef idname)
+SmallVector<bNode *> NodeTreeQuery::nodes_with_idname(StringRef idname)
 {
   SmallVector<bNode *> result;
   for (bNode *bnode : m_nodes) {
@@ -65,7 +65,7 @@ SmallVector<bNode *> BNodeTreeLookup::nodes_with_idname(StringRef idname)
   return result;
 }
 
-SmallVector<bNode *> BNodeTreeLookup::nodes_connected_to_socket(bNodeSocket *bsocket)
+SmallVector<bNode *> NodeTreeQuery::nodes_connected_to_socket(bNodeSocket *bsocket)
 {
   SmallVector<bNode *> result;
   for (bNodeSocket *origin : m_direct_links.lookup_default(bsocket)) {
diff --git a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
index e9c2455736f..6f519b0434f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -8,7 +8,7 @@
 namespace FN {
 namespace DataFlowNodes {
 
-using BKE::BNodeTreeLookup;
+using BKE::NodeTreeQuery;
 
 static bool is_input_node(const bNode *bnode)
 {
@@ -139,8 +139,8 @@ static DFGB_SocketVector insert_function_output(BTreeGraphBuilder &builder)
 
 static bool insert_links(BTreeGraphBuilder &builder, GraphInserters &inserters)
 {
-  BNodeTreeLookup btree_lookup(builder.btree());
-  for (auto &link : btree_lookup.single_origin_links()) {
+  NodeTreeQuery btree_query(builder.btree());
+  for (auto &link : btree_query.single_origin_links()) {
     if (!builder.is_data_socket(link.to)) {
       continue;
     }
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index 6bbd18be706..81b35107fe2 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -38,7 +38,7 @@
 
 using namespace BParticles;
 
-using BKE::BNodeTreeLookup;
+using BKE::NodeTreeQuery;
 using BLI::ArrayRef;
 using BLI::float3;
 using BLI::SmallVector;
@@ -228,11 +228,11 @@ class ModifierStepDescription : public StepDescription {
 static ModifierStepDescription *step_description_from_node_tree(bNodeTree *btree)
 {
   ModifierStepDescription *step_description = new ModifierStepDescription();
-  BNodeTreeLookup btree_lookup(btree);
+  NodeTreeQuery btree_query(btree);
 
   SmallMap<bNode *, uint> id_per_type_node;
 
-  auto particle_type_nodes = btree_lookup.nodes_with_idname("bp_ParticleTypeNode");
+  auto particle_type_nodes = btree_query.nodes_with_idname("bp_ParticleTypeNode");
   for (uint i = 0; i < particle_type_nodes.size(); i++) {
     bNode *particle_type_node = particle_type_nodes[i];
 
@@ -243,10 +243,10 @@ static ModifierStepDescription *step_description_from_node_tree(bNodeTree *btree
     id_per_type_node.add_new(particle_type_node, i);
   }
 
-  auto emitter_nodes = btree_lookup.nodes_with_idname("bp_MeshEmitterNode");
+  auto emitter_nodes = btree_query.nodes_with_idname("bp_MeshEmitterNode");
   for (bNode *emitter_node : emitter_nodes) {
     bNodeSocket *emitter_output = (bNodeSocket *)emitter_node->outputs.first;
-    auto connected_nodes = btree_lookup.nodes_connected_to_socket(emitter_output);
+    auto connected_nodes = btree_query.nodes_connected_to_socket(emitter_output);
     for (bNode *connected_node : connected_nodes) {
       uint type_id = id_per_type_node.lookup(connected_node);