[Bf-blender-cvs] [58c67cdde4d] functions: remove unnecessary typedef

[Jacques Lucke]

Commit: 58c67cdde4da49c161481d55d53e207d784e7adf
Author: Jacques Lucke
Date:   Mon Jul 29 12:19:01 2019 +0200
Branches: functions
https://developer.blender.org/rB58c67cdde4da49c161481d55d53e207d784e7adf

remove unnecessary typedef

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

M	source/blender/functions/core/function_graph.hpp
M	source/blender/functions/frontends/data_flow_nodes/function_generation.cpp

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

diff --git a/source/blender/functions/core/function_graph.hpp b/source/blender/functions/core/function_graph.hpp
index af1c0811326..637c0567dc7 100644
--- a/source/blender/functions/core/function_graph.hpp
+++ b/source/blender/functions/core/function_graph.hpp
@@ -10,18 +10,16 @@
 
 namespace FN {
 
-using DFGraphSocketSetVector = SetVector<DFGraphSocket>;
-
 class FunctionGraph {
  private:
   SharedDataFlowGraph m_graph;
-  DFGraphSocketSetVector m_inputs;
-  DFGraphSocketSetVector m_outputs;
+  SetVector<DFGraphSocket> m_inputs;
+  SetVector<DFGraphSocket> m_outputs;
 
  public:
   FunctionGraph(SharedDataFlowGraph graph,
-                DFGraphSocketSetVector inputs,
-                DFGraphSocketSetVector outputs)
+                SetVector<DFGraphSocket> inputs,
+                SetVector<DFGraphSocket> outputs)
       : m_graph(std::move(graph)), m_inputs(std::move(inputs)), m_outputs(std::move(outputs))
   {
   }
@@ -36,12 +34,12 @@ class FunctionGraph {
     return m_graph;
   }
 
-  const DFGraphSocketSetVector &inputs() const
+  const SetVector<DFGraphSocket> &inputs() const
   {
     return m_inputs;
   }
 
-  const DFGraphSocketSetVector &outputs() const
+  const SetVector<DFGraphSocket> &outputs() const
   {
     return m_outputs;
   }
diff --git a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
index 91003b0c4a5..f5ae986c130 100644
--- a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
@@ -11,8 +11,8 @@ namespace DataFlowNodes {
 
 static void find_interface_sockets(VirtualNodeTree &vtree,
                                    VTreeDataGraph &data_graph,
-                                   DFGraphSocketSetVector &r_inputs,
-                                   DFGraphSocketSetVector &r_outputs)
+                                   SetVector<DFGraphSocket> &r_inputs,
+                                   SetVector<DFGraphSocket> &r_outputs)
 {
   VirtualNode *input_node = vtree.nodes_with_idname("fn_FunctionInputNode").get(0, nullptr);
   VirtualNode *output_node = vtree.nodes_with_idname("fn_FunctionOutputNode").get(0, nullptr);
@@ -41,8 +41,8 @@ static ValueOrError<FunctionGraph> generate_function_graph(VirtualNodeTree &vtre
 
   VTreeDataGraph data_graph = data_graph_or_error.extract_value();
 
-  DFGraphSocketSetVector input_sockets;
-  DFGraphSocketSetVector output_sockets;
+  SetVector<DFGraphSocket> input_sockets;
+  SetVector<DFGraphSocket> output_sockets;
   find_interface_sockets(vtree, data_graph, input_sockets, output_sockets);
 
   return FunctionGraph(data_graph.graph(), input_sockets, output_sockets);