simplify naming

5 files changed, 60 insertions, 60 deletions

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index ca4cfe796af..5f48466ba07 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -1051,7 +1051,7 @@ static GeometrySet compute_geometry(const XXXNodeTree &tree,
 
   Map<XXXOutputSocket, GMutablePointer> group_inputs;
 
-  const XXXNodeTreeContext *root_context = &tree.root_context();
+  const XXXTreeContext *root_context = &tree.root_context();
   if (group_input_sockets.size() > 0) {
     Span<const OutputSocketRef *> remaining_input_sockets = group_input_sockets;
 
diff --git a/source/blender/nodes/NOD_XXX_node_tree.hh b/source/blender/nodes/NOD_XXX_node_tree.hh
index 62b9fce54dc..cb453f1d13c 100644
--- a/source/blender/nodes/NOD_XXX_node_tree.hh
+++ b/source/blender/nodes/NOD_XXX_node_tree.hh
@@ -23,7 +23,7 @@
 
 namespace blender::nodes {
 
-class XXXNodeTreeContext;
+class XXXTreeContext;
 class XXXNodeTree;
 
 struct XXXNode;
@@ -31,33 +31,33 @@ struct XXXSocket;
 struct XXXInputSocket;
 struct XXXOutputSocket;
 
-class XXXNodeTreeContext {
+class XXXTreeContext {
  private:
-  XXXNodeTreeContext *parent_context_;
+  XXXTreeContext *parent_context_;
   const NodeRef *parent_node_;
   const NodeTreeRef *tree_;
-  Map<const NodeRef *, XXXNodeTreeContext *> children_;
+  Map<const NodeRef *, XXXTreeContext *> children_;
 
   friend XXXNodeTree;
 
  public:
   const NodeTreeRef &tree() const;
-  const XXXNodeTreeContext *parent_context() const;
+  const XXXTreeContext *parent_context() const;
   const NodeRef *parent_node() const;
-  const XXXNodeTreeContext *child_context(const NodeRef &node) const;
+  const XXXTreeContext *child_context(const NodeRef &node) const;
   bool is_root() const;
 };
 
 class XXXNode {
  private:
-  const XXXNodeTreeContext *context_ = nullptr;
+  const XXXTreeContext *context_ = nullptr;
   const NodeRef *node_ref_ = nullptr;
 
  public:
   XXXNode() = default;
-  XXXNode(const XXXNodeTreeContext *context, const NodeRef *node);
+  XXXNode(const XXXTreeContext *context, const NodeRef *node);
 
-  const XXXNodeTreeContext *context() const;
+  const XXXTreeContext *context() const;
   const NodeRef *node_ref() const;
   const NodeRef *operator->() const;
 
@@ -70,16 +70,16 @@ class XXXNode {
 
 class XXXSocket {
  protected:
-  const XXXNodeTreeContext *context_ = nullptr;
+  const XXXTreeContext *context_ = nullptr;
   const SocketRef *socket_ref_ = nullptr;
 
  public:
   XXXSocket() = default;
-  XXXSocket(const XXXNodeTreeContext *context, const SocketRef *socket);
+  XXXSocket(const XXXTreeContext *context, const SocketRef *socket);
   XXXSocket(const XXXInputSocket &input_socket);
   XXXSocket(const XXXOutputSocket &output_socket);
 
-  const XXXNodeTreeContext *context() const;
+  const XXXTreeContext *context() const;
   const SocketRef *socket_ref() const;
   const SocketRef *operator->() const;
 
@@ -93,7 +93,7 @@ class XXXSocket {
 class XXXInputSocket : public XXXSocket {
  public:
   XXXInputSocket() = default;
-  XXXInputSocket(const XXXNodeTreeContext *context, const InputSocketRef *socket);
+  XXXInputSocket(const XXXTreeContext *context, const InputSocketRef *socket);
   explicit XXXInputSocket(const XXXSocket &base_socket);
 
   const InputSocketRef *socket_ref() const;
@@ -108,7 +108,7 @@ class XXXInputSocket : public XXXSocket {
 class XXXOutputSocket : public XXXSocket {
  public:
   XXXOutputSocket() = default;
-  XXXOutputSocket(const XXXNodeTreeContext *context, const OutputSocketRef *socket);
+  XXXOutputSocket(const XXXTreeContext *context, const OutputSocketRef *socket);
   explicit XXXOutputSocket(const XXXSocket &base_socket);
 
   const OutputSocketRef *socket_ref() const;
@@ -123,27 +123,27 @@ class XXXOutputSocket : public XXXSocket {
 class XXXNodeTree {
  private:
   LinearAllocator<> allocator_;
-  XXXNodeTreeContext *root_context_;
+  XXXTreeContext *root_context_;
   VectorSet<const NodeTreeRef *> used_node_tree_refs_;
 
  public:
   XXXNodeTree(bNodeTree &btree, NodeTreeRefMap &node_tree_refs);
   ~XXXNodeTree();
 
-  const XXXNodeTreeContext &root_context() const;
+  const XXXTreeContext &root_context() const;
   Span<const NodeTreeRef *> used_node_tree_refs() const;
 
   bool has_link_cycles() const;
   void foreach_node(FunctionRef<void(XXXNode)> callback) const;
 
  private:
-  XXXNodeTreeContext &construct_context_recursively(XXXNodeTreeContext *parent_context,
-                                                    const NodeRef *parent_node,
-                                                    bNodeTree &btree,
-                                                    NodeTreeRefMap &node_tree_refs);
-  void destruct_context_recursively(XXXNodeTreeContext *context);
+  XXXTreeContext &construct_context_recursively(XXXTreeContext *parent_context,
+                                                const NodeRef *parent_node,
+                                                bNodeTree &btree,
+                                                NodeTreeRefMap &node_tree_refs);
+  void destruct_context_recursively(XXXTreeContext *context);
 
-  void foreach_node_in_context_recursive(const XXXNodeTreeContext &context,
+  void foreach_node_in_context_recursive(const XXXTreeContext &context,
                                          FunctionRef<void(XXXNode)> callback) const;
 };
 
@@ -152,36 +152,36 @@ using namespace node_tree_ref_types;
 using nodes::XXXInputSocket;
 using nodes::XXXNode;
 using nodes::XXXNodeTree;
-using nodes::XXXNodeTreeContext;
 using nodes::XXXOutputSocket;
 using nodes::XXXSocket;
+using nodes::XXXTreeContext;
 }  // namespace xxx_node_tree_types
 
 /* --------------------------------------------------------------------
- * XXXNodeTreeContext inline methods.
+ * XXXTreeContext inline methods.
  */
 
-inline const NodeTreeRef &XXXNodeTreeContext::tree() const
+inline const NodeTreeRef &XXXTreeContext::tree() const
 {
   return *tree_;
 }
 
-inline const XXXNodeTreeContext *XXXNodeTreeContext::parent_context() const
+inline const XXXTreeContext *XXXTreeContext::parent_context() const
 {
   return parent_context_;
 }
 
-inline const NodeRef *XXXNodeTreeContext::parent_node() const
+inline const NodeRef *XXXTreeContext::parent_node() const
 {
   return parent_node_;
 }
 
-inline const XXXNodeTreeContext *XXXNodeTreeContext::child_context(const NodeRef &node) const
+inline const XXXTreeContext *XXXTreeContext::child_context(const NodeRef &node) const
 {
   return children_.lookup_default(&node, nullptr);
 }
 
-inline bool XXXNodeTreeContext::is_root() const
+inline bool XXXTreeContext::is_root() const
 {
   return parent_context_ == nullptr;
 }
@@ -190,13 +190,13 @@ inline bool XXXNodeTreeContext::is_root() const
  * XXXNode inline methods.
  */
 
-inline XXXNode::XXXNode(const XXXNodeTreeContext *context, const NodeRef *node_ref)
+inline XXXNode::XXXNode(const XXXTreeContext *context, const NodeRef *node_ref)
     : context_(context), node_ref_(node_ref)
 {
   BLI_assert(node_ref == nullptr || &node_ref->tree() == &context->tree());
 }
 
-inline const XXXNodeTreeContext *XXXNode::context() const
+inline const XXXTreeContext *XXXNode::context() const
 {
   return context_;
 }
@@ -228,7 +228,7 @@ inline const NodeRef *XXXNode::operator->() const
 
 inline uint64_t XXXNode::hash() const
 {
-  return DefaultHash<const XXXNodeTreeContext *>{}(context_) ^
+  return DefaultHash<const XXXTreeContext *>{}(context_) ^
          DefaultHash<const NodeRef *>{}(node_ref_);
 }
 
@@ -236,7 +236,7 @@ inline uint64_t XXXNode::hash() const
  * XXXSocket inline methods.
  */
 
-inline XXXSocket::XXXSocket(const XXXNodeTreeContext *context, const SocketRef *socket_ref)
+inline XXXSocket::XXXSocket(const XXXTreeContext *context, const SocketRef *socket_ref)
     : context_(context), socket_ref_(socket_ref)
 {
   BLI_assert(socket_ref == nullptr || &socket_ref->tree() == &context->tree());
@@ -252,7 +252,7 @@ inline XXXSocket::XXXSocket(const XXXOutputSocket &output_socket)
 {
 }
 
-inline const XXXNodeTreeContext *XXXSocket::context() const
+inline const XXXTreeContext *XXXSocket::context() const
 {
   return context_;
 }
@@ -284,7 +284,7 @@ inline const SocketRef *XXXSocket::operator->() const
 
 inline uint64_t XXXSocket::hash() const
 {
-  return DefaultHash<const XXXNodeTreeContext *>{}(context_) ^
+  return DefaultHash<const XXXTreeContext *>{}(context_) ^
          DefaultHash<const SocketRef *>{}(socket_ref_);
 }
 
@@ -292,7 +292,7 @@ inline uint64_t XXXSocket::hash() const
  * XXXInputSocket inline methods.
  */
 
-inline XXXInputSocket::XXXInputSocket(const XXXNodeTreeContext *context,
+inline XXXInputSocket::XXXInputSocket(const XXXTreeContext *context,
                                       const InputSocketRef *socket_ref)
     : XXXSocket(context, socket_ref)
 {
@@ -317,7 +317,7 @@ inline const InputSocketRef *XXXInputSocket::operator->() const
  * XXXOutputSocket inline methods.
  */
 
-inline XXXOutputSocket::XXXOutputSocket(const XXXNodeTreeContext *context,
+inline XXXOutputSocket::XXXOutputSocket(const XXXTreeContext *context,
                                         const OutputSocketRef *socket_ref)
     : XXXSocket(context, socket_ref)
 {
@@ -342,7 +342,7 @@ inline const OutputSocketRef *XXXOutputSocket::operator->() const
  * XXXNodeTree inline methods.
  */
 
-inline const XXXNodeTreeContext &XXXNodeTree::root_context() const
+inline const XXXTreeContext &XXXNodeTree::root_context() const
 {
   return *root_context_;
 }
diff --git a/source/blender/nodes/NOD_node_tree_multi_function.hh b/source/blender/nodes/NOD_node_tree_multi_function.hh
index 0d2d25ff5ef..e4923215109 100644
--- a/source/blender/nodes/NOD_node_tree_multi_function.hh
+++ b/source/blender/nodes/NOD_node_tree_multi_function.hh
@@ -90,7 +90,7 @@ class MFNetworkTreeMap {
     sockets_by_xxx_socket_.add(dsocket, &socket);
   }
 
-  void add(const XXXNodeTreeContext &context,
+  void add(const XXXTreeContext &context,
            Span<const InputSocketRef *> dsockets,
            Span<fn::MFInputSocket *> sockets)
   {
@@ -100,7 +100,7 @@ class MFNetworkTreeMap {
     }
   }
 
-  void add(const XXXNodeTreeContext &context,
+  void add(const XXXTreeContext &context,
            Span<const OutputSocketRef *> dsockets,
            Span<fn::MFOutputSocket *> sockets)
   {
@@ -120,7 +120,7 @@ class MFNetworkTreeMap {
                         node.outputs().cast<fn::MFSocket *>());
   }
 
-  void add_try_match(const XXXNodeTreeContext &context,
+  void add_try_match(const XXXTreeContext &context,
                      Span<const InputSocketRef *> dsockets,
                      Span<fn::MFInputSocket *> sockets)
   {
@@ -128,7 +128,7 @@ class MFNetworkTreeMap {
         context, dsockets.cast<const SocketRef *>(), sockets.cast<fn::MFSocket *>());
   }
 
-  void add_try_match(const XXXNodeTreeContext &context,
+  void add_try_match(const XXXTreeContext &context,
                      Span<const OutputSocketRef *> dsockets,
                      Span<fn::MFOutputSocket *> sockets)
   {
@@ -136,7 +136,7 @@ class MFNetworkTreeMap {
         context, dsockets.cast<const SocketRef *>(), sockets.cast<fn::MFSocket *>());
   }
 
-  void add_try_match(const XXXNodeTreeContext &context,
+  void add_try_match(const XXXTreeContext &context,
                      Span<const SocketRef *> dsockets,
                      Span<fn::MFSocket *> sockets)
   {
diff --git a/source/blender/nodes/function/nodes/node_fn_random_float.cc b/source/blender/nodes/function/nodes/node_fn_random_float.cc
index 60cbe4a5405..6c467b70cf3 100644
--- a/source/blender/nodes/function/nodes/node_fn_random_float.cc
+++ b/source/blender/nodes/function/nodes/node_fn_random_float.cc
@@ -70,7 +70,7 @@ static void fn_node_random_float_expand_in_mf_network(
   blender::nodes::XXXNode node = builder.dnode();
   const blender::DefaultHash<blender::StringRefNull> hasher;
   function_seed = 33 * function_seed + hasher(node->name());
-  for (const blender::nodes::XXXNodeTreeContext *context = node.context(); context != nullptr;
+  for (const blender::nodes::XXXTreeContext *context = node.context(); context != nullptr;
        context = context->parent_context()) {
     function_seed = 33 * function_seed + hasher(context->parent_node()->name());
   }
diff --git a/source/blender/nodes/intern/xxx_node_tree.cc b/source/blender/nodes/intern/xxx_node_tree.cc
index 3170c26f490..d1214ac860d 100644
--- a/source/blender/nodes/intern/xxx_node_tree.cc
+++ b/source/blender/nodes/intern/xxx_node_tree.cc
@@ -23,12 +23,12 @@ XXXNodeTree::XXXNodeTree(bNodeTree &btree, NodeTreeRefMap &node_tree_refs)
   root_context_ = &this->construct_context_recursively(nullptr, nullptr, btree, node_tree_refs);
 }
 
-XXXNodeTreeContext &XXXNodeTree::construct_context_recursively(XXXNodeTreeContext *parent_context,
-                                                               const NodeRef *parent_node,
-                                                               bNodeTree &btree,
-                                                               NodeTreeRefMap &node_tree_refs)
+XXXTreeContext &XXXNodeTree::construct_context_recursively(XXXTreeContext *parent_context,
+                                                           const NodeRef *parent_node,
+                                                           bNodeTree &btree,
+                                                           NodeTreeRefMap &node_tree_refs)
 {
-  XXXNodeTreeContext &context = *allocator_.construct<XXXNodeTreeContext>();
+  XXXTreeContext &context = *allocator_.construct<XXXTreeContext>();
   context.parent_context_ = parent_context;
   context.parent_node_ = parent_node;
   context.tree_ = &get_tree_ref_from_map(node_tree_refs, btree);
@@ -39,7 +39,7 @@ XXXNodeTreeContext &XXXNodeTree::construct_context_recursively(XXXNodeTreeContex
       bNode *bnode = node->bnode();
       bNodeTree *child_btree = reinterpret_cast<bNodeTree *>(bnode->id);
       if (child_btree != nullptr) {
-        XXXNodeTreeContext &child = this->construct_context_recursively(
+        XXXTreeContext &child = this->construct_context_recursively(
             &context, node, *child_btree, node_tree_refs);
         context.children_.add_new(node, &child);
       }
@@ -55,12 +55,12 @@ XXXNodeTree::~XXXNodeTree()
   this->destruct_context_recursively(root_context_);
 }
 
-void XXXNodeTree::destruct_context_recursively(XXXNodeTreeContext *context)
+void XXXNodeTree::destruct_context_recursively(XXXTreeContext *context)
 {
-  for (XXXNodeTreeContext *child : context->children_.values()) {
+  for (XXXTreeContext *child : context->children_.values()) {
     this->destruct_context_recursively(child);
   }
-  context->~XXXNodeTreeContext();
+  context->~XXXTreeContext();
 }
 
 bool XXXNodeTree::has_link_cycles() const
@@ -78,13 +78,13 @@ void XXXNodeTree::foreach_node(FunctionRef<void(XXXNode)> callback) const
   this->foreach_node_in_context_recursive(*root_context_, callback);
 }
 
-void XXXNodeTree::foreach_node_in_context_recursive(const XXXNodeTreeContext &context,
+void XXXNodeTree::foreach_node_in_context_recursive(const XXXTreeContext &context,
                                                     FunctionRef<void(XXXNode)> callback) const
 {
   for (const NodeRef *node_ref : context.tree_->nodes()) {
     callback(XXXNode(&context, node_ref));
   }
-  for (const XXXNodeTreeContext *child_context : context.children_.values()) {
+  for (const XXXTreeContext *child_context : context.children_.values()) {
     this->foreach_node_in_context_recursive(*child_context, callback);
   }
 }
@@ -95,7 +95,7 @@ XXXOutputSocket XXXInputSocket::get_corresponding_group_node_output() const
   BLI_assert(socket_ref_->node().is_group_output_node());
   BLI_assert(socket_ref_->index() < socket_ref_->node().inputs().size() - 1);
 
-  const XXXNodeTreeContext *parent_context = context_->parent_context();
+  const XXXTreeContext *parent_context = context_->parent_context();
   const NodeRef *parent_node = context_->parent_node();
   BLI_assert(parent_context != nullptr);
   BLI_assert(parent_node != nullptr);
@@ -109,7 +109,7 @@ XXXOutputSocket XXXInputSocket::get_corresponding_group_input_socket() const
   BLI_assert(*this);
   BLI_assert(socket_ref_->node().is_group_node());
 
-  const XXXNodeTreeContext *child_context = context_->child_context(socket_ref_->node());
+  const XXXTreeContext *child_context = context_->child_context(socket_ref_->node());
   BLI_assert(child_context != nullptr);
 
   const NodeTreeRef &child_tree = child_context->tree();
@@ -126,7 +126,7 @@ XXXInputSocket XXXOutputSocket::get_corresponding_group_node_input() const
   BLI_assert(socket_ref_->node().is_group_input_node());
   BLI_assert(socket_ref_->index() < socket_ref_->node().outputs().size() - 1);
 
-  const XXXNodeTreeContext *parent_context = context_->parent_context();
+  const XXXTreeContext *parent_context = context_->parent_context();
   const NodeRef *parent_node = context_->parent_node();
   BLI_assert(parent_context != nullptr);
   BLI_assert(parent_node != nullptr);
@@ -140,7 +140,7 @@ XXXInputSocket XXXOutputSocket::get_corresponding_group_output_socket() const
   BLI_assert(*this);
   BLI_assert(socket_ref_->node().is_group_node());
 
-  const XXXNodeTreeContext *child_context = context_->child_context(socket_ref_->node());
+  const XXXTreeContext *child_context = context_->child_context(socket_ref_->node());
   BLI_assert(child_context != nullptr);
 
   const NodeTreeRef &child_tree = child_context->tree();