[Bf-blender-cvs] [77e8c8ccf11] simulation-tree: move functions in class

[Jacques Lucke]

Commit: 77e8c8ccf112e78dad53095e9412477c1dfc37f7
Author: Jacques Lucke
Date:   Wed Feb 19 14:23:59 2020 +0100
Branches: simulation-tree
https://developer.blender.org/rB77e8c8ccf112e78dad53095e9412477c1dfc37f7

move functions in class

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

M	source/blender/simulations/nodes/my_test_node.cc

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

diff --git a/source/blender/simulations/nodes/my_test_node.cc b/source/blender/simulations/nodes/my_test_node.cc
index df1af6223b7..4d5b652c99c 100644
--- a/source/blender/simulations/nodes/my_test_node.cc
+++ b/source/blender/simulations/nodes/my_test_node.cc
@@ -327,33 +327,6 @@ struct NodeTypeCallbacks {
   DrawFunc m_draw;
 };
 
-static void init_node(bNodeTree *ntree, bNode *node)
-{
-  NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)node->typeinfo->userdata;
-
-  LinearAllocator<> allocator;
-  NodeDecl node_decl{*ntree, *node};
-  NodeBuilder node_builder{allocator, node_decl};
-  node->storage = callbacks.m_init_storage();
-  callbacks.m_declare_node(node_builder);
-  node_decl.build();
-}
-
-static void copy_node(bNodeTree *UNUSED(dst_ntree), bNode *dst_node, const bNode *src_node)
-{
-  BLI_assert(dst_node->typeinfo == src_node->typeinfo);
-  NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)dst_node->typeinfo->userdata;
-
-  dst_node->storage = callbacks.m_copy_storage(src_node->storage);
-  callbacks.m_copy_node(dst_node, src_node);
-}
-
-static void free_node(bNode *node)
-{
-  NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)node->typeinfo->userdata;
-  callbacks.m_free_storage(node->storage);
-}
-
 class NodeTypeDefinition {
  private:
   bNodeType m_ntype;
@@ -474,6 +447,34 @@ class NodeTypeDefinition {
   {
     nodeRegisterType(&m_ntype);
   }
+
+ private:
+  static void init_node(bNodeTree *ntree, bNode *node)
+  {
+    NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)node->typeinfo->userdata;
+
+    LinearAllocator<> allocator;
+    NodeDecl node_decl{*ntree, *node};
+    NodeBuilder node_builder{allocator, node_decl};
+    node->storage = callbacks.m_init_storage();
+    callbacks.m_declare_node(node_builder);
+    node_decl.build();
+  }
+
+  static void copy_node(bNodeTree *UNUSED(dst_ntree), bNode *dst_node, const bNode *src_node)
+  {
+    BLI_assert(dst_node->typeinfo == src_node->typeinfo);
+    NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)dst_node->typeinfo->userdata;
+
+    dst_node->storage = callbacks.m_copy_storage(src_node->storage);
+    callbacks.m_copy_node(dst_node, src_node);
+  }
+
+  static void free_node(bNode *node)
+  {
+    NodeTypeCallbacks &callbacks = *(NodeTypeCallbacks *)node->typeinfo->userdata;
+    callbacks.m_free_storage(node->storage);
+  }
 };
 
 void register_node_type_my_test_node()