1 files changed, 30 insertions, 49 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h
index fe3b8b75ccc..59be34bf0e3 100644
--- a/source/blender/compositor/intern/COM_Converter.h
+++ b/source/blender/compositor/intern/COM_Converter.h
@@ -31,56 +31,37 @@ class NodeOperationOutput;
 class NodeOperationBuilder;
 
 /**
- * \brief Conversion methods for the compositor
+ * \brief Wraps a bNode in its Node instance.
+ *
+ * For all nodetypes a wrapper class is created.
+ *
+ * \note When adding a new node to blender, this method needs to be changed to return the correct
+ * Node instance.
+ *
+ * \see Node
  */
-class Converter {
- public:
-  /**
-   * \brief Convert/wraps a bNode in its Node instance.
-   *
-   * For all nodetypes a wrapper class is created.
-   *
-   * \note When adding a new node to blender, this method needs to be changed to return the correct
-   * Node instance.
-   *
-   * \see Node
-   */
-  static Node *convert(bNode *b_node);
-
-  /**
-   * \brief True if the node is considered 'fast'.
-   *
-   * Slow nodes will be skipped if fast execution is required.
-   */
-  static bool is_fast_node(bNode *b_node);
+Node *COM_convert_bnode(bNode *b_node);
 
-  /**
-   * \brief This method will add a datetype conversion rule when the to-socket does not support the
-   * from-socket actual data type.
-   *
-   * \note this method is called when conversion is needed.
-   *
-   * \param link: the NodeLink what needs conversion
-   * \param system: the ExecutionSystem to add the conversion to.
-   * \see NodeLink - a link between two sockets
-   */
-  static NodeOperation *convertDataType(NodeOperationOutput *from, NodeOperationInput *to);
+/**
+ * \brief True if the node is considered 'fast'.
+ *
+ * Slow nodes will be skipped if fast execution is required.
+ */
+bool COM_bnode_is_fast_node(const bNode &b_node);
 
-  /**
-   * \brief This method will add a resolution rule based on the settings of the NodeInput.
-   *
-   * \note Conversion logic is implemented in this method
-   * \see InputSocketResizeMode for the possible conversions.
-   *
-   * \param link: the NodeLink what needs conversion
-   * \param system: the ExecutionSystem to add the conversion to.
-   * \see NodeLink - a link between two sockets
-   */
-  static void convertResolution(NodeOperationBuilder &builder,
-                                NodeOperationOutput *fromSocket,
-                                NodeOperationInput *toSocket);
+/**
+ * \brief This function will add a datetype conversion rule when the to-socket does not support the
+ * from-socket actual data type.
+ */
+NodeOperation *COM_convert_data_type(const NodeOperationOutput &from,
+                                     const NodeOperationInput &to);
 
-#ifdef WITH_CXX_GUARDEDALLOC
-  MEM_CXX_CLASS_ALLOC_FUNCS("COM:Converter")
-#endif
-};
+/**
+ * \brief This function will add a resolution rule based on the settings of the NodeInput.
+ *
+ * \note Conversion logic is implemented in this function.
+ * \see InputSocketResizeMode for the possible conversions.
+ */
+void COM_convert_resolution(NodeOperationBuilder &builder,
+                            NodeOperationOutput *fromSocket,
+                            NodeOperationInput *toSocket);